fix time stat in completed jobs

WIPACrepo · Nov 1, 2024 · e83723d · e83723d
1 parent 670e1eb
commit e83723d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/iceprod/server/plugins/condor.py b/iceprod/server/plugins/condor.py
@@ -170,7 +170,7 @@ class CondorSubmit:
     }
 
     _GENERIC_ADS = ['Iwd', 'IceProdDatasetId', 'IceProdTaskId', 'IceProdTaskInstanceId', 'MATCH_EXP_JOBGLIDEIN_ResourceName']
-    AD_INFO = ['RemotePool', 'RemoteHost', 'LastRemoteHost', 'LastRemotePool', 'HoldReason', 'LastHoldReason', 'RemoveReason', 'MachineAttrGLIDEIN_Site0'] + _GENERIC_ADS
+    AD_INFO = ['RemotePool', 'RemoteHost', 'RemoteWallClockTime', 'HoldReason', 'LastHoldReason', 'RemoveReason', 'MachineAttrGLIDEIN_Site0'] + _GENERIC_ADS
     AD_PROJECTION_QUEUE = ['JobStatus', 'RemotePool', 'RemoteHost'] + _GENERIC_ADS
     AD_PROJECTION_HISTORY = [
         'JobStatus', 'ExitCode', 'RemoveReason', 'LastHoldReason', 'CpusUsage', 'RemoteSysCpu', 'RemoteUserCpu',
@@ -663,12 +663,12 @@ async def wait(self, timeout):
 
                                 # get stats
                                 cpu = event.get('CpusUsage', None)
-                                if not cpu:
-                                    cpu = parse_usage(event.get('RunRemoteUsage', ''))
                                 gpu = event.get('GpusUsage', None)
                                 memory = event.get('MemoryUsage', None)  # MB
                                 disk = event.get('DiskUsage', None)  # KB
-                                time_ = event.get('LastRemoteWallClockTime', None)  # seconds
+                                time_ = event.get('RemoteWallClockTime', None)  # seconds
+                                if not time_:
+                                    time_ = parse_usage(event.get('RunRemoteUsage', ''))
                                 # data_in = event['ReceivedBytes']  # KB
                                 # data_out = event['SentBytes']  # KB