Merge pull request #5670 from DIRACGridBot/cherry-pick-2-d6ba0970a-integration

[sweep:integration] Handle requests for killed jobs

Author: fstagni

src/DIRAC/RequestManagementSystem/Client/ReqClient.py

@@ -380,8 +380,13 @@ def finalizeRequest(self, requestID, jobID, useCertificates=True):
                     newJobStatus = JobStatus.DONE
                 elif jobMinorStatus == JobMinorStatus.APP_ERRORS:
                     newJobStatus = JobStatus.FAILED
+                elif jobMinorStatus == JobMinorStatus.MARKED_FOR_TERMINATION:
+                    # If the job has been Killed, set it Killed
+                    newJobStatus = JobStatus.KILLED
                 else:
-                    self.log.error("finalizeRequest: Unexpected jobMinorStatus", "(got %s)" % jobMinorStatus)
+                    self.log.error(
+                        "finalizeRequest: Unexpected jobMinorStatus", "for %d (got %s)" % (jobID, jobMinorStatus)
+                    )
                     return S_ERROR("Unexpected jobMinorStatus")
 
             if newJobStatus:
@@ -598,8 +603,8 @@ def printRequest(request, status=None, full=False, verbose=True, terse=False):
             op = indexOperation[1]
             if not terse or op.Status == "Failed":
                 printOperation(indexOperation, verbose, onlyFailed=terse)
-
-    printFTSJobs(request)
+    if not terse:
+        printFTSJobs(request)
 
 
 def printOperation(indexOperation, verbose=True, onlyFailed=False):

src/DIRAC/WorkloadManagementSystem/Client/JobMinorStatus.py

@@ -50,6 +50,8 @@
 #
 JOB_WRAPPER_EXECUTION = "JobWrapper execution"
 #
+MARKED_FOR_TERMINATION = "Marked for termination"
+#
 RECEIVED_KILL_SIGNAL = "Received Kill signal"
 #
 RESOLVING_OUTPUT_SANDBOX = "Resolving Output Sandbox"