Merge pull request #2209 from ganga-devs/delete_waiting

delete waiting jobs
ganga-devs · Oct 31, 2023 · ba06a14 · ba06a14
2 parents 77c5de0 + 1f8d1a5
commit ba06a14
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ganga/GangaDirac/Lib/Server/DiracCommands.py b/ganga/GangaDirac/Lib/Server/DiracCommands.py
@@ -10,7 +10,12 @@ def getJobGroupJobs(jg):
 @diracCommand
 def kill(id):
     ''' Kill a given DIRAC Job ID within DIRAC '''
-    return dirac.killJob(id)
+    stat_results = dirac.getJobStatus(id)
+    stat = stat_results['Value'][id].get('Status', None)
+    if stat == 'Waiting':
+        return dirac.deleteJob(id)
+    else:
+        return dirac.killJob(id)
 
 
 @diracCommand