fix(resources): apply suggestions in Condor/HTCondor

Author: aldbr

src/DIRAC/Resources/Computing/BatchSystems/Condor.py

@@ -26,6 +26,8 @@
 
 HOLD_REASON_SUBCODE = "55"
 
+STATE_ATTRIBUTES = "ClusterId,ProcId,JobStatus,HoldReasonCode,HoldReasonSubCode,HoldReason"
+
 subTemplate = """
 # Environment
 # -----------
@@ -94,7 +96,7 @@ def getCondorStatus(jobMetadata):
     """parse the condor_q or condor_history output for the job status
 
     :param jobMetadata: dict with job metadata
-    :type lines: dict[str, str | int]
+    :type jobMetadata: dict[str, str | int]
     :returns: Status as known by DIRAC, and a reason if the job is being held
     """
     if jobMetadata["JobStatus"] != 5:
@@ -272,10 +274,9 @@ def getJobStatus(self, **kwargs):
 
         # Prepare the command to get the status of the jobs
         cmdJobs = " ".join(str(jobID) for jobID in jobIDList)
-        attributes = "ClusterId,ProcId,JobStatus,HoldReasonCode,HoldReasonSubCode,HoldReason"
 
         # Get the status of the jobs currently active
-        cmd = "condor_q %s -attributes %s -json" % (cmdJobs, attributes)
+        cmd = "condor_q %s -attributes %s -json" % (cmdJobs, STATE_ATTRIBUTES)
         sp = subprocess.Popen(
             shlex.split(cmd),
             stdout=subprocess.PIPE,
@@ -290,10 +291,10 @@ def getJobStatus(self, **kwargs):
             resultDict["Message"] = error
             return resultDict
 
-        jobMetadata = json.loads(output)
+        jobsMetadata = json.loads(output)
 
         # Get the status of the jobs in the history
-        condorHistCall = "condor_history %s -attributes %s -json" % (cmdJobs, attributes)
+        condorHistCall = "condor_history %s -attributes %s -json" % (cmdJobs, STATE_ATTRIBUTES)
         sp = subprocess.Popen(
             shlex.split(condorHistCall),
             stdout=subprocess.PIPE,
@@ -308,12 +309,12 @@ def getJobStatus(self, **kwargs):
             resultDict["Message"] = error
             return resultDict
 
-        jobMetadata += json.loads(output)
+        jobsMetadata += json.loads(output)
 
         statusDict = {}
-        # Build a set of job IDs found in jobMetadata
+        # Build a set of job IDs found in jobsMetadata
         foundJobIDs = set()
-        for jobDict in jobMetadata:
+        for jobDict in jobsMetadata:
             jobID = "%s.%s" % (jobDict["ClusterId"], jobDict["ProcId"])
             statusDict[jobID], _ = getCondorStatus(jobDict)
             foundJobIDs.add(jobID)

src/DIRAC/Resources/Computing/HTCondorCEComputingElement.py

@@ -64,7 +64,12 @@
 from DIRAC.Core.Utilities.List import breakListIntoChunks
 from DIRAC.Core.Utilities.Subprocess import systemCall
 from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import writeToTokenFile
-from DIRAC.Resources.Computing.BatchSystems.Condor import HOLD_REASON_SUBCODE, getCondorStatus, subTemplate
+from DIRAC.Resources.Computing.BatchSystems.Condor import (
+    HOLD_REASON_SUBCODE,
+    STATE_ATTRIBUTES,
+    getCondorStatus,
+    subTemplate,
+)
 from DIRAC.Resources.Computing.ComputingElement import ComputingElement
 from DIRAC.WorkloadManagementSystem.Client import PilotStatus
 
@@ -409,38 +414,36 @@ def getJobStatus(self, jobIDList):
             jobReference = jobReference.split(":::")[0]
             condorIDs[self._jobReferenceToCondorID(jobReference)] = jobReference
 
-        attributes = "ClusterId,ProcId,JobStatus,HoldReasonCode,HoldReasonSubCode,HoldReason"
-
-        qList = []
+        jobsMetadata = []
         for _condorIDs in breakListIntoChunks(condorIDs.keys(), 100):
             cmd = ["condor_q"]
             cmd.extend(self.remoteScheddOptions.strip().split(" "))
             cmd.extend(_condorIDs)
-            cmd.extend(["-attributes", attributes])
+            cmd.extend(["-attributes", STATE_ATTRIBUTES])
             cmd.extend(["-json"])
             result = self._executeCondorCommand(cmd, keepTokenFile=True)
             if not result["OK"]:
                 return result
 
             if result["Value"]:
-                qList.extend(json.loads(result["Value"]))
+                jobsMetadata.extend(json.loads(result["Value"]))
 
             condorHistCall = ["condor_history"]
             condorHistCall.extend(self.remoteScheddOptions.strip().split(" "))
             condorHistCall.extend(_condorIDs)
-            condorHistCall.extend(["-attributes", attributes])
+            condorHistCall.extend(["-attributes", STATE_ATTRIBUTES])
             condorHistCall.extend(["-json"])
             result = self._executeCondorCommand(cmd, keepTokenFile=True)
             if not result["OK"]:
                 return result
 
             if result["Value"]:
-                qList.extend(json.loads(result["Value"]))
+                jobsMetadata.extend(json.loads(result["Value"]))
 
         foundJobIDs = set()
-        for jobMetadata in qList:
-            jobStatus, reason = getCondorStatus(jobMetadata)
-            condorId = f"{jobMetadata['ClusterId']}.{jobMetadata['ProcId']}"
+        for jobDict in jobsMetadata:
+            jobStatus, reason = getCondorStatus(jobDict)
+            condorId = f"{jobDict['ClusterId']}.{jobDict['ProcId']}"
             jobReference = condorIDs.get(condorId)
 
             if jobStatus == PilotStatus.ABORTED: