fix: use removeJob instead of deleteJob when needed

Author: fstagni

src/DIRAC/Interfaces/API/Dirac.py

@@ -1651,8 +1651,9 @@ def getOutputSandbox(self, jobID, outputDir=None, oversized=True, noJobDir=False
     #############################################################################
 
     def deleteJob(self, jobID):
-        """Delete job or list of jobs from the WMS, if running these jobs will
-        also be killed.
+        """
+        Delete (set status=DELETED) to job or list of jobs from the WMS
+        If running, these jobs will be first killed.
 
         Example Usage:
 

src/DIRAC/TransformationSystem/Agent/TransformationCleaningAgent.py

@@ -654,7 +654,7 @@ def __removeWMSTasks(self, transJobIDs):
                 self.log.error("Failed to kill jobs", "(n=%d)" % len(res["FailedJobIDs"]))
                 allRemove = False
 
-            res = self.wmsClient.deleteJob(jobList)
+            res = self.wmsClient.removeJob(jobList)
             if res["OK"]:
                 self.log.info("Successfully removed jobs from WMS", "(n=%d)" % len(jobList))
             elif ("InvalidJobIDs" in res) and ("NonauthorizedJobIDs" not in res) and ("FailedJobIDs" not in res):

src/DIRAC/WorkloadManagementSystem/Client/WMSClient.py

@@ -205,8 +205,8 @@ def submitJob(self, jdl, jobDescriptionObject=None):
                             break
                         time.sleep(1)
                     if not confirmed:
-                        # The bulk submission failed, try to delete the created jobs
-                        resultDelete = self.jobManager.deleteJob(jobIDList)
+                        # The bulk submission failed, try to remove the created jobs
+                        resultDelete = self.jobManager.removeJob(jobIDList)
                         error = "Job submission failed to confirm bulk transaction"
                         if not resultDelete["OK"]:
                             error += "; removal of created jobs failed"