Also stop jobs that ended with shadow exception.

This commit is contained in:
Joachim Meyer 2022-11-29 15:48:05 +01:00
parent 6175affa55
commit d83f263dba

View File

@ -373,7 +373,7 @@ class CondorSync:
# # time as new end time. Otherwise CC refuses to end the job. # # time as new end time. Otherwise CC refuses to end the job.
# endtime = int(ccjob['startTime']) + 1 # endtime = int(ccjob['startTime']) + 1
jobstate_map = {4: "cancelled", 5: "completed", 9: "cancelled", jobstate_map = {4: "cancelled", 5: "completed", 7: "failed", 9: "cancelled",
10: "stopped", 12: "stopped", 24: "failed"} 10: "stopped", 12: "stopped", 24: "failed"}
jobstate = jobstate_map[job['TriggerEventTypeNumber']] jobstate = jobstate_map[job['TriggerEventTypeNumber']]
@ -415,8 +415,9 @@ class CondorSync:
if event['TriggerEventTypeNumber'] == 1: # Execute if event['TriggerEventTypeNumber'] == 1: # Execute
self._ccStartJob(event) self._ccStartJob(event)
elif event['TriggerEventTypeNumber'] == 4 or event['TriggerEventTypeNumber'] == 5 or \ elif event['TriggerEventTypeNumber'] == 4 or event['TriggerEventTypeNumber'] == 5 or \
event['TriggerEventTypeNumber'] == 9 or event['TriggerEventTypeNumber'] == 10 or \ event['TriggerEventTypeNumber'] == 7 or event['TriggerEventTypeNumber'] == 9 or \
event['TriggerEventTypeNumber'] == 12 or event['TriggerEventTypeNumber'] == 24: event['TriggerEventTypeNumber'] == 10 or event['TriggerEventTypeNumber'] == 12 or \
event['TriggerEventTypeNumber'] == 24:
self._ccStopJob(event) self._ccStopJob(event)
def sync(self, limit=200, jobid=None, direction='both'): def sync(self, limit=200, jobid=None, direction='both'):