fix(resources): condor command line call compatible with v24

Author: antonio falabella

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

@@ -313,7 +313,13 @@ def getJobStatus(self, **kwargs):
             resultDict["Message"] = "No user name"
             return resultDict
 
-        cmd = "condor_q -submitter %s -af:j JobStatus HoldReasonCode HoldReasonSubCode HoldReason" % user
+        #https://htcondor.readthedocs.io/en/latest/man-pages/condor_q.html
+        # As of version 8.5.2, condor_q defaults to querying only the current user’s jobs. 
+        # This default is overridden when the restriction list has usernames and/or job ids, 
+        # when the -submitter or -allusers arguments are specified, 
+        # or when the current user is a queue superuser. 
+        # It can also be overridden by setting the CONDOR_Q_ONLY_MY_JOBS configuration macro to False. 
+        cmd = "condor_q -af:j JobStatus HoldReasonCode HoldReasonSubCode HoldReason"
         sp = subprocess.Popen(
             shlex.split(cmd),
             stdout=subprocess.PIPE,
@@ -330,8 +336,10 @@ def getJobStatus(self, **kwargs):
 
         qList = output.strip().split("\n")
 
+        # The condor_history command also has some slight modifications. The submitter option
+        # is no more and user is just issued before the formatting.
         condorHistCall = (
-            "condor_history -af:j JobStatus HoldReasonCode HoldReasonSubCode HoldReason -submitter %s" % user
+            "condor_history %s -af:j JobStatus HoldReasonCode HoldReasonSubCode HoldReason" % user
         )
         sp = subprocess.Popen(
             shlex.split(condorHistCall),
@@ -371,9 +379,15 @@ def getCEStatus(self, **kwargs):
 
         waitingJobs = 0
         runningJobs = 0
-
+        
+        #https://htcondor.readthedocs.io/en/latest/man-pages/condor_q.html
+        # As of version 8.5.2, condor_q defaults to querying only the current user’s jobs. 
+        # This default is overridden when the restriction list has usernames and/or job ids, 
+        # when the -submitter or -allusers arguments are specified, 
+        # or when the current user is a queue superuser. 
+        # It can also be overridden by setting the CONDOR_Q_ONLY_MY_JOBS configuration macro to False. 
         sp = subprocess.Popen(
-            shlex.split("condor_q -submitter %s" % user),
+            "condor_q",
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             universal_newlines=True,
@@ -400,12 +414,17 @@ def getCEStatus(self, **kwargs):
         if output:
             lines = output.split("\n")
             for line in lines:
-                if not line.strip():
+                tokens = line.split()
+                #Skip head and footer lines
+                if (len(tokens) == 0) or (len(tokens) < 9):
                     continue
-                if " I " in line:
+                if tokens[7] == '1':
                     waitingJobs += 1
-                elif " R " in line:
+                elif tokens[6] == '1':
                     runningJobs += 1
+                elif tokens[8] == '1':
+                    waitingJobs += 1
+
 
         # Final output
         resultDict["Status"] = 0