DIRAC 9.0.0a60__py3-none-any.whl → 9.0.0a61__py3-none-any.whl

DIRAC/AccountingSystem/Client/AccountingCLI.py

@@ -57,99 +57,6 @@ class AccountingCLI(CLI):
         traceback.print_tb(sys.exc_info()[2])
         print("________________________\n")
 
-    def do_registerType(self, args):
-        """
-        Registers a new accounting type
-          Usage : registerType <typeName>
-          <DIRACRoot>/DIRAC/AccountingSystem/Client/Types/<typeName>
-           should exist and inherit the base type
-        """
-        try:
-            argList = args.split()
-            if argList:
-                typeName = argList[0].strip()
-            else:
-                gLogger.error("No type name specified")
-                return
-            # Try to import the type
-            result = self.objectLoader.loadObject(f"DIRAC.AccountingSystem.Client.Types.{typeName}")
-            if not result["OK"]:
-                return result
-            typeClass = result["Value"]
-
-            gLogger.info(f"Loaded type {typeClass.__name__}")
-            typeDef = typeClass().getDefinition()
-            acClient = DataStoreClient()
-            retVal = acClient.registerType(*typeDef)
-            if retVal["OK"]:
-                gLogger.info("Type registered successfully")
-            else:
-                gLogger.error(f"Error: {retVal['Message']}")
-        except Exception:
-            self.showTraceback()
-
-    def do_resetBucketLength(self, args):
-        """
-        Set the bucket Length. Will trigger a recalculation of buckets. Can take a while.
-          Usage : resetBucketLength <typeName>
-          <DIRACRoot>/DIRAC/AccountingSystem/Client/Types/<typeName>
-           should exist and inherit the base type
-        """
-        try:
-            argList = args.split()
-            if argList:
-                typeName = argList[0].strip()
-            else:
-                gLogger.error("No type name specified")
-                return
-
-            # Try to import the type
-            result = self.objectLoader.loadObject(f"DIRAC.AccountingSystem.Client.Types.{typeName}")
-            if not result["OK"]:
-                return result
-            typeClass = result["Value"]
-            gLogger.info(f"Loaded type {typeClass.__name__}")
-            typeDef = typeClass().getDefinition()
-            acClient = DataStoreClient()
-            retVal = acClient.setBucketsLength(typeDef[0], typeDef[3])
-            if retVal["OK"]:
-                gLogger.info("Type registered successfully")
-            else:
-                gLogger.error(f"Error: {retVal['Message']}")
-        except Exception:
-            self.showTraceback()
-
-    def do_regenerateBuckets(self, args):
-        """
-        Regenerate buckets for type. Can take a while.
-          Usage : regenerateBuckets <typeName>
-          <DIRACRoot>/DIRAC/AccountingSystem/Client/Types/<typeName>
-           should exist and inherit the base type
-        """
-        try:
-            argList = args.split()
-            if argList:
-                typeName = argList[0].strip()
-            else:
-                gLogger.error("No type name specified")
-                return
-
-            # Try to import the type
-            result = self.objectLoader.loadObject(f"DIRAC.AccountingSystem.Client.Types.{typeName}")
-            if not result["OK"]:
-                return result
-            typeClass = result["Value"]
-            gLogger.info(f"Loaded type {typeClass.__name__}")
-            typeDef = typeClass().getDefinition()
-            acClient = DataStoreClient()
-            retVal = acClient.regenerateBuckets(typeDef[0])
-            if retVal["OK"]:
-                gLogger.info("Buckets recalculated!")
-            else:
-                gLogger.error(f"Error: {retVal['Message']}")
-        except Exception:
-            self.showTraceback()
-
     def do_showRegisteredTypes(self, args):
         """
         Get a list of registered types
@@ -170,50 +77,3 @@ class AccountingCLI(CLI):
                 print(" Value fields:\n  %s" % "\n  ".join(typeList[2]))
         except Exception:
             self.showTraceback()
-
-    def do_deleteType(self, args):
-        """
-        Delete a registered accounting type.
-          Usage : deleteType <typeName>
-          WARN! It will delete all data associated to that type! VERY DANGEROUS!
-          If you screw it, you'll discover a new dimension of pain and doom! :)
-        """
-        try:
-            argList = args.split()
-            if argList:
-                typeName = argList[0].strip()
-            else:
-                gLogger.error("No type name specified")
-                return
-
-            choice = input(
-                f"Are you completely sure you want to delete type {typeName} and all it's data? yes/no [no]: "
-            )
-            choice = choice.lower()
-            if choice not in ("yes", "y"):
-                print("Delete aborted")
-                return
-
-            acClient = DataStoreClient()
-            retVal = acClient.deleteType(typeName)
-            if not retVal["OK"]:
-                gLogger.error(f"Error: {retVal['Message']}")
-                return
-            print("Hope you meant it, because it's done")
-        except Exception:
-            self.showTraceback()
-
-    def do_compactBuckets(self, args):
-        """
-        Compact buckets table
-          Usage : compactBuckets
-        """
-        try:
-            acClient = DataStoreClient()
-            retVal = acClient.compactDB()
-            if not retVal["OK"]:
-                gLogger.error(f"Error: {retVal['Message']}")
-                return
-            gLogger.info("Done")
-        except Exception:
-            self.showTraceback()

DIRAC/AccountingSystem/Client/DataStoreClient.py

@@ -122,19 +122,6 @@ class DataStoreClient(Client):
 
         return S_OK()
 
-    def remove(self, register):
-        """
-        Remove a Register from the Accounting DataStore
-        """
-        if not self.__checkBaseType(register.__class__):
-            return S_ERROR("register is not a valid type (has to inherit from BaseAccountingType")
-        retVal = register.checkValues()
-        if not retVal["OK"]:
-            return retVal
-        if gConfig.getValue("/LocalSite/DisableAccounting", False):
-            return S_OK()
-        return self._getRPC().remove(*register.getValues())
-
 
 def _sendToFailover(rpcStub):
     """Create a ForwardDISET operation for failover"""

DIRAC/AccountingSystem/Client/Types/BaseAccountingType.py

@@ -161,13 +161,6 @@ class BaseAccountingType:
                 cD[self.fieldsList[iPos]] = self.valuesList[iPos]
         return cD
 
-    def registerToServer(self):
-        """
-        Register type in server
-        """
-        rpcClient = Client(url="Accounting/DataStore")
-        return rpcClient.registerType(*self.getDefinition())
-
     def commit(self):
         """
         Commit register to server

DIRAC/AccountingSystem/ConfigTemplate.cfg

@@ -9,11 +9,6 @@ Services
     Authorization
     {
       Default = authenticated
-      compactDB = ServiceAdministrator
-      deleteType = ServiceAdministrator
-      registerType = ServiceAdministrator
-      setBucketsLength = ServiceAdministrator
-      regenerateBuckets = ServiceAdministrator
     }
   }
   ##END

DIRAC/AccountingSystem/Service/DataStoreHandler.py

@@ -14,7 +14,6 @@ import datetime
 from DIRAC import S_ERROR, S_OK
 from DIRAC.AccountingSystem.DB.MultiAccountingDB import MultiAccountingDB
 from DIRAC.ConfigurationSystem.Client import PathFinder
-from DIRAC.Core.Base.Client import Client
 from DIRAC.Core.DISET.RequestHandler import RequestHandler, getServiceOption
 from DIRAC.Core.Utilities import TimeUtilities
 from DIRAC.Core.Utilities.ThreadScheduler import gThreadScheduler
@@ -39,30 +38,6 @@ class DataStoreHandler(RequestHandler):
             gThreadScheduler.addPeriodicTask(60, cls.__acDB.loadPendingRecords)
         return S_OK()
 
-    types_registerType = [str, list, list, list]
-
-    def export_registerType(self, typeName, definitionKeyFields, definitionAccountingFields, bucketsLength):
-        """
-        Register a new type. (Only for all powerful admins)
-        """
-        return self.__acDB.registerType(typeName, definitionKeyFields, definitionAccountingFields, bucketsLength)
-
-    types_setBucketsLength = [str, list]
-
-    def export_setBucketsLength(self, typeName, bucketsLength):
-        """
-        Change the buckets Length. (Only for all powerful admins)
-        """
-        return self.__acDB.changeBucketsLength(typeName, bucketsLength)
-
-    types_regenerateBuckets = [str]
-
-    def export_regenerateBuckets(self, typeName):
-        """
-        Recalculate buckets. (Only for all powerful admins)
-        """
-        return self.__acDB.regenerateBuckets(typeName)
-
     types_getRegisteredTypes = []
 
     def export_getRegisteredTypes(self):
@@ -106,51 +81,4 @@ class DataStoreHandler(RequestHandler):
             records.append((entry[0], startTime, endTime, entry[3]))
         return self.__acDB.insertRecordBundleThroughQueue(records)
 
-    types_compactDB = []
-
-    def export_compactDB(self):
-        """
-        Compact the db by grouping buckets
-        """
-        # if we are running workers (not only one service) we can redirect the request to the master
-        # For more information please read the Administrative guide Accounting part!
-        # ADVICE: If you want to trigger the bucketing, please make sure the bucketing is not running!!!!
-        if self.runBucketing:
-            return self.__acDB.compactBuckets()
-
-        return Client(url="Accounting/DataStoreMaster").compactDB()
-
     types_remove = [str, datetime.datetime, datetime.datetime, list]
-
-    def export_remove(self, typeName, startTime, endTime, valuesList):
-        """
-        Remove a record for a type
-        """
-        startTime = int(TimeUtilities.toEpoch(startTime))
-        endTime = int(TimeUtilities.toEpoch(endTime))
-        return self.__acDB.deleteRecord(typeName, startTime, endTime, valuesList)
-
-    types_removeRegisters = [list]
-
-    def export_removeRegisters(self, entriesList):
-        """
-        Remove a record for a type
-        """
-        expectedTypes = [str, datetime.datetime, datetime.datetime, list]
-        for entry in entriesList:
-            if len(entry) != 4:
-                return S_ERROR("Invalid records")
-            for i, en in enumerate(entry):
-                if not isinstance(en, expectedTypes[i]):
-                    return S_ERROR(f"{i} field in the records should be {expectedTypes[i]}")
-        ok = 0
-        for entry in entriesList:
-            startTime = int(TimeUtilities.toEpoch(entry[1]))
-            endTime = int(TimeUtilities.toEpoch(entry[2]))
-            record = entry[3]
-            result = self.__acDB.deleteRecord(entry[0], startTime, endTime, record)
-            if not result["OK"]:
-                return S_OK(ok)
-            ok += 1
-
-        return S_OK(ok)

DIRAC/Core/DISET/private/BaseClient.py

@@ -323,7 +323,7 @@ class BaseClient:
             pass
 
         # We randomize the list, and add at the end the failover URLs (System/FailoverURLs/Component)
-        urlsList = List.randomize(List.fromChar(urls, ",")) + failoverUrls
+        urlsList = List.fromChar(urls, ",") + failoverUrls
         self.__nbOfUrls = len(urlsList)
         self.__nbOfRetry = (
             2 if self.__nbOfUrls > 2 else 3
@@ -445,7 +445,6 @@ and this is thread {cThID}
             return self.__initStatus
         if self.__enableThreadCheck:
             self.__checkThreadID()
-
         gLogger.debug(f"Trying to connect to: {self.serviceURL}")
         try:
             # Calls the transport method of the apropriate protocol.

DIRAC/Core/scripts/dirac_apptainer_exec.py

@@ -100,7 +100,8 @@ def main():
         gLogger.error(result["Message"])
         DIRAC.exit(1)
     if result["Value"][0] != 0:
-        gLogger.error(result["Value"][2])
+        gLogger.error("Apptainer command failed with exit code", result["Value"][0])
+        gLogger.error("Command output:", result["Value"])
         DIRAC.exit(2)
     gLogger.notice(result["Value"][1])
 

DIRAC/DataManagementSystem/Utilities/DMSHelpers.py

@@ -1,7 +1,8 @@
 """
-  This module contains helper methods for accessing operational attributes or parameters of DMS objects
+This module contains helper methods for accessing operational attributes or parameters of DMS objects
 
 """
+
 from collections import defaultdict
 from DIRAC import gConfig, gLogger, S_OK, S_ERROR
 from DIRAC.ConfigurationSystem.Client.Helpers.Path import cfgPath
@@ -17,6 +18,9 @@ sLog = gLogger.getSubLogger(__name__)
 def resolveSEGroup(seGroupList, allSEs=None):
     """
     Resolves recursively a (list of) SEs that can be groupSEs
+    For modules, JobWrapper or whatever runs at a given site,
+    prefer using :py:func:`~DIRAC.DataManagementSystem.Utilities.ResolveSE.getDestinationSEList`
+
 
     :param seGroupList: list of SEs to resolve or comma-separated SEs
     :type seGroupList: list or string

DIRAC/MonitoringSystem/DB/MonitoringDB.py

@@ -447,26 +447,6 @@ class MonitoringDB(ElasticDB):
                 records.append({paramName: getattr(resObj["_source"], paramName) for paramName in paramNames})
             return S_OK(records)
 
-    def getLastDayData(self, typeName, condDict):
-        """
-        It returns the last day data for a given monitoring type.
-
-        :returns: for example
-
-          .. code-block:: python
-
-           {'sort': [{'timestamp': {'order': 'desc'}}],
-            'query': {'bool': {'must': [{'match': {'host': 'dzmathe.cern.ch'}},
-                                        {'match': {'component': 'Bookkeeping_BookkeepingManager'}}]}}}
-
-        :param str typeName: name of the monitoring type
-        :param dict condDict: conditions for the query
-
-                      * key -> name of the field
-                      * value -> list of possible values
-        """
-        return self.__getRawData(typeName, condDict)
-
     def getLimitedData(self, typeName, condDict, size=10):
         """
         Returns a list of records for a given selection.

DIRAC/MonitoringSystem/Service/MonitoringHandler.py

@@ -244,24 +244,6 @@ class MonitoringHandlerMixin:
         reportRequest["generatePlot"] = False
         return reporter.generate(reportRequest)
 
-    types_addMonitoringRecords = [str, list]
-
-    def export_addMonitoringRecords(self, monitoringtype, data):
-        """
-        Bulk insert data directly to the given monitoring type.
-
-        :param str monitoringtype: monitoring type name
-        :param list data: list of documents
-        :returns: S_OK or S_ERROR
-        """
-
-        retVal = self.__db.getIndexName(monitoringtype)
-        if not retVal["OK"]:
-            return retVal
-        prefix = retVal["Value"]
-        gLogger.debug("addMonitoringRecords:", prefix)
-        return self.__db.bulk_index(prefix, data)
-
     types_addRecords = [str, str, list]
 
     def export_addRecords(self, indexname, monitoringType, data):
@@ -290,21 +272,6 @@ class MonitoringHandlerMixin:
         gLogger.debug("delete index:", indexName)
         return self.__db.deleteIndex(indexName)
 
-    types_getLastDayData = [str, dict]
-
-    def export_getLastDayData(self, typeName, condDict):
-        """
-        It returns the data from the last day index. Note: we create daily indexes.
-
-        :param str typeName: name of the monitoring type
-        :param dict condDict: conditions for the query
-
-                       * key -> name of the field
-                       * value -> list of possible values
-        """
-
-        return self.__db.getLastDayData(typeName, condDict)
-
     types_getLimitedDat = [str, dict, int]
 
     def export_getLimitedData(self, typeName, condDict, size):

DIRAC/Resources/Computing/BatchSystems/Condor.py

@@ -6,6 +6,7 @@
 from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division
+import json
 import re
 import tempfile
 import subprocess
@@ -25,6 +26,8 @@ STATES_MAP = {
 
 HOLD_REASON_SUBCODE = "55"
 
+STATE_ATTRIBUTES = "ClusterId,ProcId,JobStatus,HoldReasonCode,HoldReasonSubCode,HoldReason"
+
 subTemplate = """
 # Environment
 # -----------
@@ -62,6 +65,7 @@ environment = "DIRAC_PILOT_STAMP=$(stamp) %(environment)s"
 # Requirements
 # ------------
 request_cpus = %(processors)s
+requirements = NumJobStarts == 0
 
 # Exit options
 # ------------
@@ -73,7 +77,8 @@ on_exit_hold = ExitCode =!= 0
 # A subcode of our choice to identify who put the job on hold
 on_exit_hold_subcode = %(holdReasonSubcode)s
 # Jobs are then deleted from the system after N days if they are not idle or running
-periodic_remove = (JobStatus != 1) && (JobStatus != 2) && ((time() - EnteredCurrentStatus) > (%(daysToKeepRemoteLogs)s * 24 * 3600))
+periodic_remove = ((JobStatus == 1) && (NumJobStarts > 0)) || \
+    ((JobStatus != 1) && (JobStatus != 2) && ((time() - EnteredCurrentStatus) > (%(daysToKeepRemoteLogs)s * 24 * 3600))
 
 # Specific options
 # ----------------
@@ -87,63 +92,34 @@ Queue stamp in %(pilotStampList)s
 """
 
 
-def parseCondorStatus(lines, jobID):
+def getCondorStatus(jobMetadata):
     """parse the condor_q or condor_history output for the job status
 
-    :param lines: list of lines from the output of the condor commands, each line is a tuple of jobID, statusID, and holdReasonCode
-    :type lines: python:list
-    :param str jobID: jobID of condor job, e.g.: 123.53
+    :param jobMetadata: dict with job metadata
+    :type jobMetadata: dict[str, str | int]
     :returns: Status as known by DIRAC, and a reason if the job is being held
     """
-    jobID = str(jobID)
-
-    holdReason = ""
-    status = None
-    for line in lines:
-        l = line.strip().split()
-
-        # Make sure the job ID exists
-        if len(l) < 1 or l[0] != jobID:
-            continue
-
-        # Make sure the status is present and is an integer
-        try:
-            status = int(l[1])
-        except (ValueError, IndexError):
-            break
-
-        # Stop here if the status is not held (5): result should be found in STATES_MAP
-        if status != 5:
-            break
-
-        # A job can be held for various reasons,
-        # we need to further investigate with the holdReasonCode & holdReasonSubCode
-        # Details in:
-        # https://htcondor.readthedocs.io/en/latest/classad-attributes/job-classad-attributes.html#HoldReasonCode
-
-        # By default, a held (5) job is defined as Aborted in STATES_MAP, but there might be some exceptions
-        status = 3
-        try:
-            holdReasonCode = l[2]
-            holdReasonSubcode = l[3]
-            holdReason = " ".join(l[4:])
-        except IndexError:
-            # This should not happen in theory
-            # Just set the status to unknown such as
-            status = None
-            holdReasonCode = "undefined"
-            holdReasonSubcode = "undefined"
-            break
-
-        # If holdReasonCode is 3 (The PERIODIC_HOLD expression evaluated to True. Or, ON_EXIT_HOLD was true)
-        # And subcode is HOLD_REASON_SUBCODE, then it means the job failed by itself, it needs to be marked as Failed
-        if holdReasonCode == "3" and holdReasonSubcode == HOLD_REASON_SUBCODE:
-            status = 5
-        # If holdReasonCode is 16 (Input files are being spooled), the job should be marked as Waiting
-        elif holdReasonCode == "16":
-            status = 1
-
-    return (STATES_MAP.get(status, "Unknown"), holdReason)
+    if jobMetadata["JobStatus"] != 5:
+        # If the job is not held, we can return the status directly
+        return (STATES_MAP.get(jobMetadata["JobStatus"], "Unknown"), "")
+
+    # A job can be held for various reasons,
+    # we need to further investigate with the holdReasonCode & holdReasonSubCode
+    # Details in:
+    # https://htcondor.readthedocs.io/en/latest/classad-attributes/job-classad-attributes.html#HoldReasonCode
+
+    # By default, a held (5) job is defined as Aborted in STATES_MAP, but there might be some exceptions
+    status = 3
+
+    # If holdReasonCode is 3 (The PERIODIC_HOLD expression evaluated to True. Or, ON_EXIT_HOLD was true)
+    # And subcode is HOLD_REASON_SUBCODE, then it means the job failed by itself, it needs to be marked as Failed
+    if jobMetadata["HoldReasonCode"] == 3 and jobMetadata["HoldReasonSubCode"] == HOLD_REASON_SUBCODE:
+        status = 5
+    # If holdReasonCode is 16 (Input files are being spooled), the job should be marked as Waiting
+    elif jobMetadata["HoldReasonCode"] == 16:
+        status = 1
+
+    return (STATES_MAP.get(status, "Unknown"), jobMetadata["HoldReason"])
 
 
 class Condor(object):
@@ -171,8 +147,6 @@ class Condor(object):
         preamble = kwargs.get("Preamble")
 
         jdlFile = tempfile.NamedTemporaryFile(dir=outputDir, suffix=".jdl", mode="wt")
-        scheddOptions = 'requirements = OpSys == "LINUX"\n'
-        scheddOptions += "gentenv = False"
         jdlFile.write(
             subTemplate
             % dict(
@@ -185,7 +159,7 @@ class Condor(object):
                 holdReasonSubcode=HOLD_REASON_SUBCODE,
                 daysToKeepRemoteLogs=1,
                 scheddOptions="",
-                extraString="",
+                extraString=submitOptions,
                 pilotStampList=",".join(stamps),
             )
         )
@@ -193,7 +167,7 @@ class Condor(object):
         jdlFile.flush()
 
         cmd = "%s; " % preamble if preamble else ""
-        cmd += "condor_submit %s %s" % (submitOptions, jdlFile.name)
+        cmd += "condor_submit %s" % jdlFile.name
         sp = subprocess.Popen(
             cmd,
             shell=True,
@@ -283,7 +257,6 @@ class Condor(object):
 
     def getJobStatus(self, **kwargs):
         """Get status of the jobs in the given list"""
-
         resultDict = {}
 
         MANDATORY_PARAMETERS = ["JobIDList"]
@@ -299,15 +272,11 @@ class Condor(object):
             resultDict["Message"] = "Empty job list"
             return resultDict
 
-        user = kwargs.get("User")
-        if not user:
-            user = os.environ.get("USER")
-        if not user:
-            resultDict["Status"] = -1
-            resultDict["Message"] = "No user name"
-            return resultDict
+        # Prepare the command to get the status of the jobs
+        cmdJobs = " ".join(str(jobID) for jobID in jobIDList)
 
-        cmd = "condor_q -submitter %s -af:j JobStatus HoldReasonCode HoldReasonSubCode HoldReason" % user
+        # Get the status of the jobs currently active
+        cmd = "condor_q %s -attributes %s -json" % (cmdJobs, STATE_ATTRIBUTES)
         sp = subprocess.Popen(
             shlex.split(cmd),
             stdout=subprocess.PIPE,
@@ -317,16 +286,15 @@ class Condor(object):
         output, error = sp.communicate()
         status = sp.returncode
 
-        if status != 0:
+        if status != 0 or not output:
             resultDict["Status"] = status
             resultDict["Message"] = error
             return resultDict
 
-        qList = output.strip().split("\n")
+        jobsMetadata = json.loads(output)
 
-        condorHistCall = (
-            "condor_history -af:j JobStatus HoldReasonCode HoldReasonSubCode HoldReason -submitter %s" % user
-        )
+        # Get the status of the jobs in the history
+        condorHistCall = "condor_history %s -attributes %s -json" % (cmdJobs, STATE_ATTRIBUTES)
         sp = subprocess.Popen(
             shlex.split(condorHistCall),
             stdout=subprocess.PIPE,
@@ -335,15 +303,26 @@ class Condor(object):
         )
         output, _ = sp.communicate()
         status = sp.returncode
-        if status == 0:
-            for line in output.split("\n"):
-                qList.append(line)
+
+        if status != 0 or not output:
+            resultDict["Status"] = status
+            resultDict["Message"] = error
+            return resultDict
+
+        jobsMetadata += json.loads(output)
 
         statusDict = {}
-        if len(qList):
-            for job in jobIDList:
-                job = str(job)
-                statusDict[job], _ = parseCondorStatus(qList, job)
+        # Build a set of job IDs found in jobsMetadata
+        foundJobIDs = set()
+        for jobDict in jobsMetadata:
+            jobID = "%s.%s" % (jobDict["ClusterId"], jobDict["ProcId"])
+            statusDict[jobID], _ = getCondorStatus(jobDict)
+            foundJobIDs.add(jobID)
+
+        # For job IDs not found, set status to "Unknown"
+        for jobID in jobIDList:
+            if str(jobID) not in foundJobIDs:
+                statusDict[str(jobID)] = "Unknown"
 
         # Final output
         status = 0
@@ -355,19 +334,30 @@ class Condor(object):
         """Get the overall status of the CE"""
         resultDict = {}
 
-        user = kwargs.get("User")
-        if not user:
-            user = os.environ.get("USER")
-        if not user:
+        cmd = "condor_q -totals -json"
+        sp = subprocess.Popen(
+            shlex.split(cmd),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            universal_newlines=True,
+        )
+        output, error = sp.communicate()
+        status = sp.returncode
+
+        if status != 0 or not output:
             resultDict["Status"] = -1
-            resultDict["Message"] = "No user name"
+            resultDict["Message"] = error
             return resultDict
 
-        waitingJobs = 0
-        runningJobs = 0
+        jresult = json.loads(output)
+        resultDict["Status"] = 0
+        resultDict["Waiting"] = jresult[0]["Idle"]
+        resultDict["Running"] = jresult[0]["Running"]
 
+        # We also need to check the hold jobs, some of them are actually waiting (e.g. for input files)
+        cmd = 'condor_q -json -constraint "JobStatus == 5" -attributes HoldReasonCode'
         sp = subprocess.Popen(
-            shlex.split("condor_q -submitter %s" % user),
+            shlex.split(cmd),
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             universal_newlines=True,
@@ -376,33 +366,42 @@ class Condor(object):
         status = sp.returncode
 
         if status != 0:
-            if "no record" in output:
-                resultDict["Status"] = 0
-                resultDict["Waiting"] = waitingJobs
-                resultDict["Running"] = runningJobs
-                return resultDict
-            resultDict["Status"] = status
+            resultDict["Status"] = -1
             resultDict["Message"] = error
             return resultDict
 
-        if "no record" in output:
-            resultDict["Status"] = 0
-            resultDict["Waiting"] = waitingJobs
-            resultDict["Running"] = runningJobs
+        # If there are no held jobs, we can return the result
+        if not output:
             return resultDict
 
-        if output:
-            lines = output.split("\n")
-            for line in lines:
-                if not line.strip():
-                    continue
-                if " I " in line:
-                    waitingJobs += 1
-                elif " R " in line:
-                    runningJobs += 1
+        jresult = json.loads(output)
+        for job_metadata in jresult:
+            if job_metadata["HoldReasonCode"] == 16:
+                resultDict["Waiting"] += 1
+
+        return resultDict
+
+    def getJobOutputFiles(self, **kwargs):
+        """Get output file names and templates for the specific CE"""
+        resultDict = {}
+
+        MANDATORY_PARAMETERS = ["JobIDList", "OutputDir", "ErrorDir"]
+        for argument in MANDATORY_PARAMETERS:
+            if argument not in kwargs:
+                resultDict["Status"] = -1
+                resultDict["Message"] = "No %s" % argument
+                return resultDict
+
+        outputDir = kwargs["OutputDir"]
+        errorDir = kwargs["ErrorDir"]
+        jobIDList = kwargs["JobIDList"]
+
+        jobDict = {}
+        for jobID in jobIDList:
+            jobDict[jobID] = {}
+            jobDict[jobID]["Output"] = "%s/%s.out" % (outputDir, jobID)
+            jobDict[jobID]["Error"] = "%s/%s.err" % (errorDir, jobID)
 
-        # Final output
         resultDict["Status"] = 0
-        resultDict["Waiting"] = waitingJobs
-        resultDict["Running"] = runningJobs
+        resultDict["Jobs"] = jobDict
         return resultDict

DIRAC/Resources/Computing/HTCondorCEComputingElement.py

@@ -50,6 +50,7 @@ When using a local condor_schedd look at the HTCondor documentation for enabling
 
 import datetime
 import errno
+import json
 import os
 import subprocess
 import tempfile
@@ -63,7 +64,12 @@ from DIRAC.Core.Utilities.File import mkDir
 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, parseCondorStatus, 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
 
@@ -400,45 +406,57 @@ class HTCondorCEComputingElement(ComputingElement):
         if isinstance(jobIDList, str):
             jobIDList = [jobIDList]
 
+        self.tokenFile = None
         resultDict = {}
         condorIDs = {}
         # Get all condorIDs so we can just call condor_q and condor_history once
         for jobReference in jobIDList:
             jobReference = jobReference.split(":::")[0]
-            condorIDs[jobReference] = self._jobReferenceToCondorID(jobReference)
-
-        self.tokenFile = None
+            condorIDs[self._jobReferenceToCondorID(jobReference)] = jobReference
 
-        qList = []
-        for _condorIDs in breakListIntoChunks(condorIDs.values(), 100):
-            # This will return a list of 1245.75 3 undefined undefined undefined
+        jobsMetadata = []
+        for _condorIDs in breakListIntoChunks(condorIDs.keys(), 100):
             cmd = ["condor_q"]
             cmd.extend(self.remoteScheddOptions.strip().split(" "))
             cmd.extend(_condorIDs)
-            cmd.extend(["-af:j", "JobStatus", "HoldReasonCode", "HoldReasonSubCode", "HoldReason"])
+            cmd.extend(["-attributes", STATE_ATTRIBUTES])
+            cmd.extend(["-json"])
             result = self._executeCondorCommand(cmd, keepTokenFile=True)
             if not result["OK"]:
                 return result
 
-            qList.extend(result["Value"].split("\n"))
+            if result["Value"]:
+                jobsMetadata.extend(json.loads(result["Value"]))
 
             condorHistCall = ["condor_history"]
             condorHistCall.extend(self.remoteScheddOptions.strip().split(" "))
             condorHistCall.extend(_condorIDs)
-            condorHistCall.extend(["-af:j", "JobStatus", "HoldReasonCode", "HoldReasonSubCode", "HoldReason"])
+            condorHistCall.extend(["-attributes", STATE_ATTRIBUTES])
+            condorHistCall.extend(["-json"])
             result = self._executeCondorCommand(cmd, keepTokenFile=True)
             if not result["OK"]:
                 return result
 
-            qList.extend(result["Value"].split("\n"))
+            if result["Value"]:
+                jobsMetadata.extend(json.loads(result["Value"]))
 
-        for job, jobID in condorIDs.items():
-            jobStatus, reason = parseCondorStatus(qList, jobID)
+        foundJobIDs = set()
+        for jobDict in jobsMetadata:
+            jobStatus, reason = getCondorStatus(jobDict)
+            condorId = f"{jobDict['ClusterId']}.{jobDict['ProcId']}"
+            jobReference = condorIDs.get(condorId)
 
             if jobStatus == PilotStatus.ABORTED:
-                self.log.verbose("Job", f"{jobID} held: {reason}")
+                self.log.verbose("Job", f"{jobReference} held: {reason}")
+
+            resultDict[jobReference] = jobStatus
+            foundJobIDs.add(jobReference)
 
-            resultDict[job] = jobStatus
+        # Check if we have any jobs that were not found in the condor_q or condor_history
+        for jobReference in condorIDs.values():
+            if jobReference not in foundJobIDs:
+                self.log.verbose("Job", f"{jobReference} not found in condor_q or condor_history")
+                resultDict[jobReference] = PilotStatus.UNKNOWN
 
         self.tokenFile = None
 

DIRAC/Resources/Computing/test/Test_HTCondorCEComputingElement.py

@@ -2,6 +2,7 @@
 """
 tests for HTCondorCEComputingElement module
 """
+import json
 import uuid
 
 import pytest
@@ -12,18 +13,30 @@ from DIRAC.Resources.Computing.BatchSystems import Condor
 
 MODNAME = "DIRAC.Resources.Computing.HTCondorCEComputingElement"
 
-STATUS_LINES = """
-123.2 5 4 0 undefined
-123.1 3 undefined undefined undefined
-""".strip().split(
-    "\n"
-)
-
-HISTORY_LINES = """
-123.0 4 undefined undefined undefined
-""".strip().split(
-    "\n"
-)
+STATUS_QUEUE = [
+    {
+        "ClusterId": 123,
+        "ProcId": 2,
+        "JobStatus": 5,
+        "HoldReasonCode": 4,
+        "HoldReasonSubCode": 0,
+        "HoldReason": "The credentials for the job are invalid",
+    },
+    {
+        "ClusterId": 123,
+        "ProcId": 1,
+        "JobStatus": 3,
+    },
+]
+
+
+STATUS_HISTORY = [
+    {
+        "ClusterId": 123,
+        "ProcId": 0,
+        "JobStatus": 4,
+    }
+]
 
 
 @pytest.fixture
@@ -32,42 +45,47 @@ def setUp():
 
 
 def test_parseCondorStatus():
-    statusLines = f"""
-  104098.1 1 undefined undefined undefined
-  104098.2 2 undefined undefined undefined
-  104098.3 3 undefined undefined undefined
-  104098.4 4 undefined undefined undefined
-  104098.5 5 16 57 Input data are being spooled
-  104098.6 5 3 {Condor.HOLD_REASON_SUBCODE} Policy
-  104098.7 5 1 0 undefined
-
-  foo bar
-  104096.1 3 16 test test
-  104096.2 3 test
-  104096.3 5 undefined undefined undefined
-  104096.4 7
-  """.strip().split(
-        "\n"
-    )
-    # force there to be an empty line
+    statusOutput = {"ClusterId": 104098, "ProcId": 1, "JobStatus": 1}
+    assert HTCE.getCondorStatus(statusOutput) == ("Waiting", "")
 
-    expectedResults = {
-        "104098.1": "Waiting",
-        "104098.2": "Running",
-        "104098.3": "Aborted",
-        "104098.4": "Done",
-        "104098.5": "Waiting",
-        "104098.6": "Failed",
-        "104098.7": "Aborted",
-        "foo": "Unknown",
-        "104096.1": "Aborted",
-        "104096.2": "Aborted",
-        "104096.3": "Aborted",
-        "104096.4": "Unknown",
-    }
+    statusOutput = {"ClusterId": 104098, "ProcId": 2, "JobStatus": 2}
+    assert HTCE.getCondorStatus(statusOutput) == ("Running", "")
+
+    statusOutput = {"ClusterId": 104098, "ProcId": 3, "JobStatus": 3}
+    assert HTCE.getCondorStatus(statusOutput) == ("Aborted", "")
+
+    statusOutput = {"ClusterId": 104098, "ProcId": 4, "JobStatus": 4}
+    assert HTCE.getCondorStatus(statusOutput) == ("Done", "")
 
-    for jobID, expected in expectedResults.items():
-        assert HTCE.parseCondorStatus(statusLines, jobID)[0] == expected
+    statusOutput = {
+        "ClusterId": 104098,
+        "ProcId": 5,
+        "JobStatus": 5,
+        "HoldReasonCode": 16,
+        "HoldReasonSubCode": 57,
+        "HoldReason": "Input data are being spooled",
+    }
+    assert HTCE.getCondorStatus(statusOutput) == ("Waiting", "Input data are being spooled")
+
+    statusOutput = {
+        "ClusterId": 104098,
+        "ProcId": 6,
+        "JobStatus": 5,
+        "HoldReasonCode": 3,
+        "HoldReasonSubCode": HTCE.HOLD_REASON_SUBCODE,
+        "HoldReason": "Policy",
+    }
+    assert HTCE.getCondorStatus(statusOutput) == ("Failed", "Policy")
+
+    statusOutput = {
+        "ClusterId": 104098,
+        "ProcId": 7,
+        "JobStatus": 5,
+        "HoldReasonCode": 1,
+        "HoldReasonSubCode": 0,
+        "HoldReason": "Aborted by user",
+    }
+    assert HTCE.getCondorStatus(statusOutput) == ("Aborted", "Aborted by user")
 
 
 def test_getJobStatus(mocker):
@@ -75,8 +93,8 @@ def test_getJobStatus(mocker):
     mocker.patch(
         MODNAME + ".systemCall",
         side_effect=[
-            S_OK((0, "\n".join(STATUS_LINES), "")),
-            S_OK((0, "\n".join(HISTORY_LINES), "")),
+            S_OK((0, json.dumps(STATUS_QUEUE), "")),
+            S_OK((0, json.dumps(STATUS_HISTORY), "")),
             S_OK((0, "", "")),
             S_OK((0, "", "")),
         ],
@@ -110,7 +128,7 @@ def test_getJobStatus(mocker):
 def test_getJobStatusBatchSystem(mocker):
     """Test Condor Batch System plugin getJobStatus"""
     patchPopen = mocker.patch("DIRAC.Resources.Computing.BatchSystems.Condor.subprocess.Popen")
-    patchPopen.return_value.communicate.side_effect = [("\n".join(STATUS_LINES), ""), ("\n".join(HISTORY_LINES), "")]
+    patchPopen.return_value.communicate.side_effect = [(json.dumps(STATUS_QUEUE), ""), (json.dumps(STATUS_HISTORY), "")]
     patchPopen.return_value.returncode = 0
 
     ret = Condor.Condor().getJobStatus(JobIDList=["123.0", "123.1", "123.2", "333.3"])

DIRAC/Resources/Storage/StorageBase.py

@@ -1,4 +1,4 @@
-""" Base Storage Class provides the base interface for all storage plug-ins
+"""Base Storage Class provides the base interface for all storage plug-ins
 
       exists()
 
@@ -33,6 +33,7 @@ These are the methods for getting information about the Storage:
       getOccupancy()
 
 """
+
 import errno
 import json
 import os
@@ -113,7 +114,8 @@ class StorageBase:
 
     def getParameters(self):
         """Get the parameters with which the storage was instantiated"""
-        parameterDict = dict(self.protocolParameters)
+        parameterDict = dict(self._allProtocolParameters)
+        parameterDict.update(self.protocolParameters)
         parameterDict["StorageName"] = self.name
         parameterDict["PluginName"] = self.pluginName
         parameterDict["URLBase"] = self.getURLBase().get("Value", "")

DIRAC/WorkloadManagementSystem/JobWrapper/JobWrapper.py

@@ -10,6 +10,7 @@ and a Watchdog Agent that can monitor its progress.
   :caption: JobWrapper options
 
 """
+
 import contextlib
 import datetime
 import glob
@@ -119,14 +120,16 @@ class JobWrapper:
         self.pilotRef = gConfig.getValue("/LocalSite/PilotReference", "Unknown")
         self.cpuNormalizationFactor = gConfig.getValue("/LocalSite/CPUNormalizationFactor", 0.0)
         self.bufferLimit = gConfig.getValue(self.section + "/BufferLimit", 10485760)
-        self.defaultOutputSE = getDestinationSEList(
-            gConfig.getValue("/Resources/StorageElementGroups/SE-USER", []), self.siteName
-        )
+        try:
+            self.defaultOutputSE = getDestinationSEList("SE-USER", self.siteName)
+        except RuntimeError:
+            self.defaultOutputSE = []
         self.defaultCatalog = gConfig.getValue(self.section + "/DefaultCatalog", [])
         self.masterCatalogOnlyFlag = gConfig.getValue(self.section + "/MasterCatalogOnlyFlag", True)
-        self.defaultFailoverSE = getDestinationSEList(
-            gConfig.getValue("/Resources/StorageElementGroups/Tier1-Failover", []), self.siteName
-        )
+        try:
+            self.defaultFailoverSE = getDestinationSEList("Tier1-Failover", self.siteName)
+        except RuntimeError:
+            self.defaultFailoverSE = []
         self.defaultOutputPath = ""
         self.retryUpload = gConfig.getValue(self.section + "/RetryUpload", False)
         self.dm = DataManager()

DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py

@@ -93,10 +93,10 @@ class PilotManagerHandler(RequestHandler):
 
         result = self.pilotAgentsDB.getPilotInfo(pilotReference)
         if not result["OK"]:
-            self.log.error("Failed to get info for pilot", result["Message"])
+            self.log.error("Failed to get info for pilot", f"{pilotReference}: {result['Message']}")
             return S_ERROR("Failed to get info for pilot")
         if not result["Value"]:
-            self.log.warn("The pilot info is empty", pilotReference)
+            self.log.warn("The pilot info is empty for", pilotReference)
             return S_ERROR("Pilot info is empty")
 
         pilotDict = result["Value"][pilotReference]
@@ -105,11 +105,14 @@ class PilotManagerHandler(RequestHandler):
         # classic logs first, by default
         funcs = [self._getPilotOutput, self._getRemotePilotOutput]
         if remote:
+            self.log.info("Trying to retrieve output of pilot", f"{pilotReference} remotely first")
             funcs.reverse()
 
         result = funcs[0](pilotReference, pilotDict)
         if not result["OK"]:
-            self.log.warn("Pilot log retrieval failed (first attempt), remote ?", remote)
+            self.log.warn(
+                "Failed getting output for pilot", f"{pilotReference}. Will try another approach: {result['Message']}"
+            )
             result = funcs[1](pilotReference, pilotDict)
             return result
         else:

{dirac-9.0.0a60.dist-info → dirac-9.0.0a61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.0a60
+Version: 9.0.0a61
 Summary: DIRAC is an interware, meaning a software framework for distributed computing.
 Home-page: https://github.com/DIRACGrid/DIRAC/
 License: GPL-3.0-only

{dirac-9.0.0a60.dist-info → dirac-9.0.0a61.dist-info}/RECORD

@@ -1,15 +1,15 @@
 DIRAC/__init__.py,sha256=IrCjUEvcKwE2KLYNuxiADIGrtOgSCb8MOoK8QVDsERU,11301
-DIRAC/AccountingSystem/ConfigTemplate.cfg,sha256=QCE21jXKXJIr1gEWMIpzKEczeqOKInfnTNkwYY0QR_c,1033
+DIRAC/AccountingSystem/ConfigTemplate.cfg,sha256=xT_JHJGumwEx_w1aditaxn3zq0r4ehIScX4qYFwjT3o,819
 DIRAC/AccountingSystem/__init__.py,sha256=E88siUatzE7vxErfezaEuZxK4yfHvkKCqqC9toGvqwg,539
 DIRAC/AccountingSystem/Agent/NetworkAgent.py,sha256=qHY-aewzEYS99VsW_Ka-aoap2kqNEAe9qcH3jg25yqI,10999
 DIRAC/AccountingSystem/Agent/__init__.py,sha256=JNmpSKBieczXNZ8srT1yYs_j6gCT8JKhqE_nhcFMel4,45
 DIRAC/AccountingSystem/Agent/test/Test_NetworkAgent.py,sha256=DvWf5QQDhjCI94LT1l9VkOFmR8jK7_2Jpfvn5_ZDMFo,3746
-DIRAC/AccountingSystem/Client/AccountingCLI.py,sha256=RRGCAchP3JbNeD020zS9U7m36VBiDfrV7KmXiejuabk,7542
-DIRAC/AccountingSystem/Client/DataStoreClient.py,sha256=pzQd3o_oUf9AZmiWst3oLARlh9ebgrN-jVwB-pQAOA4,6110
+DIRAC/AccountingSystem/Client/AccountingCLI.py,sha256=ME7UyAdIzznx9NLtjnLe2-uIc9lB_Brnc9qa_zrtFVE,2401
+DIRAC/AccountingSystem/Client/DataStoreClient.py,sha256=C7UofNw3NIecJhg1p2cQuIJ42Vr3TM4tWdhjlTAm4gs,5592
 DIRAC/AccountingSystem/Client/ReportCLI.py,sha256=6BGufbZN_5MUJeiYgdnISfyCbAMyjVX7-mDxZLiedJ4,1907
 DIRAC/AccountingSystem/Client/ReportsClient.py,sha256=smGoZ4pDTj6hjj0cDpQsRmNjbuxX6ukc5dbzNliXn10,3587
 DIRAC/AccountingSystem/Client/__init__.py,sha256=dT6KQbA-0PPotnu-T_ofVcW-HmuRL3Q9t2HRAERkC6E,46
-DIRAC/AccountingSystem/Client/Types/BaseAccountingType.py,sha256=PGNwFKYS6bn5VRazzyRwQLN6gn04VXpKbh2xDRaRekA,6388
+DIRAC/AccountingSystem/Client/Types/BaseAccountingType.py,sha256=NrH2ywkKq7vLs7voMH0XEsL7OOanbMWxeRjT-Kd9BNk,6183
 DIRAC/AccountingSystem/Client/Types/DataOperation.py,sha256=LTklg_czWwjYMZktswD-JtnnyV8VTQ1SC_d9ejIBvRs,1224
 DIRAC/AccountingSystem/Client/Types/Job.py,sha256=oBwd_U2HK0Ej9iEJFUcTmmdyFn1nJWQ_k4ZbAkgC6Dc,2176
 DIRAC/AccountingSystem/Client/Types/Network.py,sha256=xKoiolYkUjG8hpNAzJEdp6luc6TARyGlIa7UYs9QYeA,1165
@@ -23,7 +23,7 @@ DIRAC/AccountingSystem/DB/AccountingDB.sql,sha256=caJDh6ioNQq7uoBvBNW2ZgO5bAKj6q
 DIRAC/AccountingSystem/DB/MultiAccountingDB.py,sha256=IiRBqCnyVhP16-hW0pwSOUXYBVAEjQQPPioK7fzVR0s,3755
 DIRAC/AccountingSystem/DB/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/AccountingSystem/DB/test/Test_AccountingDB.py,sha256=vnMd_CrK7zBTieno9U5yMtfE5KwqX_xiETbaiBMCFzw,15849
-DIRAC/AccountingSystem/Service/DataStoreHandler.py,sha256=ci-tr8iUL_VmwjobDvZNsyoCtb6KpQrCbpvnBHXpbZc,6047
+DIRAC/AccountingSystem/Service/DataStoreHandler.py,sha256=e5RjESW16kYaBQ0bhUJuHZULizZzcOTXYg2c_uMxcdk,3338
 DIRAC/AccountingSystem/Service/ReportGeneratorHandler.py,sha256=fksRV5NN0GVkNSmnvjEWQop0TrQ8TiMUmJf8CcIAhRw,8485
 DIRAC/AccountingSystem/Service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/AccountingSystem/private/DBUtils.py,sha256=2yTapP3e5WS67d_yWW0_uTeDUxi62Zr0Ogp3vfooUa8,12869
@@ -125,7 +125,7 @@ DIRAC/Core/DISET/ServiceReactor.py,sha256=JU3cPaVvXVUtbkXm1KPje4T4Ksg1mH728FW_OW
 DIRAC/Core/DISET/ThreadConfig.py,sha256=Q43BnQ8yliFliU65rLxHBV49c4TFzrYq9Ewe5n2vASQ,3086
 DIRAC/Core/DISET/TransferClient.py,sha256=2WDH3Be5NSAY4xWRK0RL2OnKeQLtaPRIJLQeeVYY5V8,7657
 DIRAC/Core/DISET/__init__.py,sha256=ZPbhSIBCK14nC9R5drkX8lfK2YHY7g-WVg0Zuy3uHAc,1085
-DIRAC/Core/DISET/private/BaseClient.py,sha256=qiDMZk2-XL8mFpzSKqyw_qvFwWWWzE5g-7w9lP4gHTo,27875
+DIRAC/Core/DISET/private/BaseClient.py,sha256=CCyTi61cqXGCEavHpwNIjrXSXQK-7FFS3vV48vot0NA,27858
 DIRAC/Core/DISET/private/FileHelper.py,sha256=Tb1UGZX_dnBE-nRljNrHFP2-0XGiC1j3c2-lUgaDo1M,14383
 DIRAC/Core/DISET/private/GatewayService.py,sha256=Doe5NPpv0HH3AQA0HcIw0D95bFbohR3NxO5SuZUagfg,20839
 DIRAC/Core/DISET/private/InnerRPCClient.py,sha256=Q60yR3JZinPlFYDU080ltrderN37oHnAZLmYZfTgC_c,2922
@@ -323,7 +323,7 @@ DIRAC/Core/Workflow/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 DIRAC/Core/Workflow/test/step_g.py,sha256=hlncZ_tbb74wz0mRxyHTl0NnjRut2ysWLgUfiTvi9yo,21830
 DIRAC/Core/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/Core/scripts/dirac_agent.py,sha256=Nx1qlr2YOQobWkO1FtzFyL00tF8TH1HmonDsfbsCDzk,1644
-DIRAC/Core/scripts/dirac_apptainer_exec.py,sha256=2WwpPLUPZWcYRjeLd6SIIXmLVSK3ibbn-RaZXtg5CPA,4197
+DIRAC/Core/scripts/dirac_apptainer_exec.py,sha256=uRPyQ27khQk_d8qMJwA3u9A-eJV8pGytSj0JXgGKptI,4298
 DIRAC/Core/scripts/dirac_cert_convert.py,sha256=3ThPmb1Tg-UgeH-3ZV0ilkZ8-H4RsK8SOszLuuYG-vs,2498
 DIRAC/Core/scripts/dirac_configure.py,sha256=c3ZfQUe_JUJASi3iuvl4qD83kyfWvS_QixISyG833sg,29494
 DIRAC/Core/scripts/dirac_executor.py,sha256=ZZnr8NjjBmmKmQhUnstRklw9HTsP75XRXnkBawDWdnE,1722
@@ -440,7 +440,7 @@ DIRAC/DataManagementSystem/Service/TornadoFileCatalogHandler.py,sha256=Exqqwl83C
 DIRAC/DataManagementSystem/Service/TornadoS3GatewayHandler.py,sha256=zJKf6Z_s0TF1eOqf4Z3ZsRZIcdEOcvT1OvcD7UaM9Wc,491
 DIRAC/DataManagementSystem/Service/__init__.py,sha256=gpMK8hQ30qy4_std-qzmjDuWA9QHVD5ceNJMyZQv44E,54
 DIRAC/DataManagementSystem/Service/test/Test_Service.py,sha256=hhb-nprUiRd2qaAqNeHM1U83xFhPdT41uOgEzlBxzBI,304
-DIRAC/DataManagementSystem/Utilities/DMSHelpers.py,sha256=L0PrpZJCPt1tBya2KayANq5QExIkBgTHmnfLSsUjT3Q,19052
+DIRAC/DataManagementSystem/Utilities/DMSHelpers.py,sha256=UXResyFhzq4PQY-40gdLjav7zQiss0ZSTimVvHJqdOE,19211
 DIRAC/DataManagementSystem/Utilities/ResolveSE.py,sha256=Z_Gamxo31OhBWCBtO_1HkC0sj1wmhifGET9-xQSpqx0,4480
 DIRAC/DataManagementSystem/Utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/DataManagementSystem/Utilities/test/Test_resolveSE.py,sha256=p9TukPS-adp4WpKFzT0pHvvsGFTRwLmb3ITtKxUNjIY,10846
@@ -696,10 +696,10 @@ DIRAC/MonitoringSystem/Client/Types/RMSMonitoring.py,sha256=DzmMIY22YKazfmfv8kOG
 DIRAC/MonitoringSystem/Client/Types/ServiceMonitoring.py,sha256=IZ_SIJbv8Eoub2DbbjKjSqlj0xNMU6wU9tX4EtOFU40,1491
 DIRAC/MonitoringSystem/Client/Types/WMSHistory.py,sha256=A6MTur_WQCGptfuDW8k2Sl-Utt8jUyUa4HzlS1lwsRA,1358
 DIRAC/MonitoringSystem/Client/Types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-DIRAC/MonitoringSystem/DB/MonitoringDB.py,sha256=fHpaVjbP0N4UYP-ejgiyHxDhXR2_Bc4TPF_BcjH0GDI,20076
+DIRAC/MonitoringSystem/DB/MonitoringDB.py,sha256=XZm32V1QShRBIq4FsONuwGHFSArXSmyc8gWmyoBgk_M,19357
 DIRAC/MonitoringSystem/DB/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/MonitoringSystem/DB/test/Test_monitoringdb.py,sha256=Jf4NZgb9V6U4DYk4SCLVoTqxJVBYsj49rIaYB7e6qxw,2788
-DIRAC/MonitoringSystem/Service/MonitoringHandler.py,sha256=LoEk57slU9qJnCKkIpKFDT2RMRmX3Hhv4UnhyvpvdrM,13406
+DIRAC/MonitoringSystem/Service/MonitoringHandler.py,sha256=JGN1MUsxP8swTuIa4qdPvo-O4UoA6TkxjfDZ1sC6L2w,12332
 DIRAC/MonitoringSystem/Service/TornadoMonitoringHandler.py,sha256=06gIHrrLJTgI-vnCHAGsDDjZrRwJaMsa8ESsdWy0Ir8,1550
 DIRAC/MonitoringSystem/Service/WebAppHandler.py,sha256=5RJmLfcSML394USyC0pqn3VdJEVJXKrZ7-Kx2OzeuxI,20542
 DIRAC/MonitoringSystem/Service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -904,7 +904,7 @@ DIRAC/Resources/Computing/AREXComputingElement.py,sha256=0QmYepoOfcYT6MBdHeG6dY_
 DIRAC/Resources/Computing/CloudComputingElement.py,sha256=N8wfRL6ppozkKFzbCuWuVvudNfAqTox1zNeDZY6lED0,21102
 DIRAC/Resources/Computing/ComputingElement.py,sha256=lAvlx7AOtkftku6sekIaEK4Wp_GlaDHnYeNfxW54zu4,19424
 DIRAC/Resources/Computing/ComputingElementFactory.py,sha256=gaYP8TvvP7OJsL2o6IMTIYYoBn6flt3Ue7f1NX4HmNY,2541
-DIRAC/Resources/Computing/HTCondorCEComputingElement.py,sha256=lMo7kOrYdg-U6LojD5DqkpW8U3Lb921xSRSAj1p2uew,25553
+DIRAC/Resources/Computing/HTCondorCEComputingElement.py,sha256=zEekKBBcbAsUgZVU6H7zOKFaV3AzS549uHnEAK61nMo,26146
 DIRAC/Resources/Computing/InProcessComputingElement.py,sha256=6PTGQrAB7ROuTrO1Eq86fmDduf6IrkVInjSMzXb00eM,4620
 DIRAC/Resources/Computing/LocalComputingElement.py,sha256=om4cH89cZANy6VF2sYeLhmESs5XVPCpEOLFckusdAxw,12533
 DIRAC/Resources/Computing/PoolComputingElement.py,sha256=QzU7R_1lmZ67lhiQseNvW493fgBL8tOkqBZxZMrFsBE,10404
@@ -913,7 +913,7 @@ DIRAC/Resources/Computing/SSHComputingElement.py,sha256=Sy-Ab2Q_honFRt4Oj_Veh7uq
 DIRAC/Resources/Computing/SingularityComputingElement.py,sha256=6bWkSEmPMV85JeKiqn1Q151QaG5rcW61-mnIU_MUj2A,17880
 DIRAC/Resources/Computing/__init__.py,sha256=S0glZLs-Q2srpRLELQPDHSB9CVAcBXrPnQsFi-ZsokM,43
 DIRAC/Resources/Computing/cloudinit.template,sha256=gF4yOILXXWjlrs3bcazLA2Wf2n7QYkebMcaD_kNWK5I,4025
-DIRAC/Resources/Computing/BatchSystems/Condor.py,sha256=tAqIVViV22q6uUFnu7rxBC3qAxDf6BLT0_UFXVPs5HA,12972
+DIRAC/Resources/Computing/BatchSystems/Condor.py,sha256=O9KctL-Pg7rZfT7-RPBtWcw1N8XGuGQOMtBxFeK0-f8,13337
 DIRAC/Resources/Computing/BatchSystems/GE.py,sha256=XkumJZPMgqxJr3qJc5EmLXOzrfKZSKuUPKZjPumTC1U,9170
 DIRAC/Resources/Computing/BatchSystems/Host.py,sha256=NmCIn6e5ZUiXiX1qIke-3G5dEEDXUznASvfIoP8Vx5U,9638
 DIRAC/Resources/Computing/BatchSystems/LSF.py,sha256=ujM4Fd22WdwM3VZgxtxXRhdV-izDkmSDbaS8Cd7YUEs,7218
@@ -942,7 +942,7 @@ DIRAC/Resources/Computing/BatchSystems/test/__init__.py,sha256=47DEQpj8HBSa-_TIm
 DIRAC/Resources/Computing/CloudProviders/OpenNebula.py,sha256=TJWtje-l5OqaXxIAeV7xr8L-WjR-eZPTAI7rVfrh09c,9928
 DIRAC/Resources/Computing/test/Test_AREXComputingElement.py,sha256=00DdLY_PLsGVogdHejIsJTRg73nwSOOS-F11gVDlBmM,2518
 DIRAC/Resources/Computing/test/Test_ComputingElement.py,sha256=lIVHO8ottEU1z0B4X_-V2Uqf6C9bJoDa-Tgh6-DVwYM,1541
-DIRAC/Resources/Computing/test/Test_HTCondorCEComputingElement.py,sha256=As_d4SHKx2vuUY7JM_Uujq_vPzk1s7V6Myun382qGGo,7560
+DIRAC/Resources/Computing/test/Test_HTCondorCEComputingElement.py,sha256=7x8SqbOHfnn-c-fzyc2FK00_cJ25A3ed-oR9rfkwKXw,8193
 DIRAC/Resources/Computing/test/Test_InProcessComputingElement.py,sha256=j_ESF_f7-Aov48rtAZUjZclQvXSlKMs3SIpPu4uTJZ0,2067
 DIRAC/Resources/Computing/test/Test_PoolComputingElement.py,sha256=KPzPRp4Pz0EpO-bDQxTcfSpvgPikvqAYv98SRStiAhQ,11843
 DIRAC/Resources/Computing/test/Test_SSHComputingElement.py,sha256=ahYUZ9hySaEXik3nvUMWJ7eP87xj6u-LMDpX7A1OQd4,2425
@@ -1003,7 +1003,7 @@ DIRAC/Resources/Storage/GFAL2_StorageBase.py,sha256=_DUQjclrxzeICOQpvNNXCLGAJ8L9
 DIRAC/Resources/Storage/GFAL2_XROOTStorage.py,sha256=MlZMV9Eh3sEEOKDkiK9D2VGDHWlpauX5c-A1KnvJLLw,4497
 DIRAC/Resources/Storage/RFIOStorage.py,sha256=KmMEY-17_FMlq2rCY03X4EJAce41Cg5Mg-tbCUwz5LI,42741
 DIRAC/Resources/Storage/S3Storage.py,sha256=5kzgfeH81724odsDoqjDggP9a4yiAD0wJt3eJsgAeT8,28080
-DIRAC/Resources/Storage/StorageBase.py,sha256=N_UquiN8w3R26BoioBMK3NCoNYHCpn7hEgFgcmcOmdA,16847
+DIRAC/Resources/Storage/StorageBase.py,sha256=ElZS4DlWWwM_WWLV61uliMy1EWrL1lpLWK18MGeWrFM,16905
 DIRAC/Resources/Storage/StorageElement.py,sha256=Tt8RoQjAiA0bH4qx7uGZk_dYYUnf5d4D1muFa8Gxq6k,62620
 DIRAC/Resources/Storage/StorageFactory.py,sha256=UlKzMOvhR8SSBpZ4QPp5taeOU_VZTlhv08ggL606Dxo,19435
 DIRAC/Resources/Storage/Utilities.py,sha256=v6PA-Y3ApNObLnsC-POM3f4UJMWcYNWTcqnQ5-T47J4,1048
@@ -1206,7 +1206,7 @@ DIRAC/WorkloadManagementSystem/FutureClient/JobMonitoringClient.py,sha256=3Mjq3h
 DIRAC/WorkloadManagementSystem/FutureClient/JobStateUpdateClient.py,sha256=tb0oz3uewK2laHYu-xwSWGPZ0ejXhfEUf6jV3x-loCM,7033
 DIRAC/WorkloadManagementSystem/FutureClient/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/WorkloadManagementSystem/JobWrapper/JobExecutionCoordinator.py,sha256=Y64YnkrKklOkXnV5wKsgzBONFljVJ0ByFVUMFNkiGAU,2461
-DIRAC/WorkloadManagementSystem/JobWrapper/JobWrapper.py,sha256=2nlcSeQgCbn5yGOytZZx1F07HkvEfwfaJ7w3GnduAq4,74697
+DIRAC/WorkloadManagementSystem/JobWrapper/JobWrapper.py,sha256=wAxQT5NMJdt94X_YHbSN-uCLgcJW6jC6NhbqRGo-Km8,74716
 DIRAC/WorkloadManagementSystem/JobWrapper/JobWrapperOfflineTemplate.py,sha256=wem5VDN9XiC7szAzdsbgHUxpIOQB2Hj36DIVMoV9px8,2490
 DIRAC/WorkloadManagementSystem/JobWrapper/JobWrapperTemplate.py,sha256=4QgcFPMLRaTagP9e_Vvsla8pFH8HdewklHfS-gyS4-g,3313
 DIRAC/WorkloadManagementSystem/JobWrapper/JobWrapperUtilities.py,sha256=5w_4PMnaHhuexChADDvt1L9Ih1PstdUuYWObnlv9Dto,10072
@@ -1228,7 +1228,7 @@ DIRAC/WorkloadManagementSystem/Service/JobPolicy.py,sha256=o88xR3roe_JRB5F53oxb1
 DIRAC/WorkloadManagementSystem/Service/JobStateUpdateHandler.py,sha256=p-dLY4GI4H8I5joOel5ZUf2JBz-BDoYmbn-6BJ_4FQE,9829
 DIRAC/WorkloadManagementSystem/Service/MatcherHandler.py,sha256=L0sdRdoSh2qa7IA5tGIPAhlJoKLB4JecCTezkaQu1tc,4554
 DIRAC/WorkloadManagementSystem/Service/OptimizationMindHandler.py,sha256=7FbhdRkerS2CM0HnIDSUo_OqRyEnjgol9RR7WfVK5Tc,8592
-DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py,sha256=r2H_3xp_TKXVvZM7c1JV3trTzdsJqXi5unyU6Tc8uTg,14649
+DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py,sha256=XYbWGlL-9wmk2FMkdGKZQgqkDjHbFEARem4mRdOaSN4,14846
 DIRAC/WorkloadManagementSystem/Service/SandboxStoreHandler.py,sha256=yFkIxpZ7QiA2gi_0gUo8DKwPBDn-IRgThPolmUvuYvA,20287
 DIRAC/WorkloadManagementSystem/Service/TornadoJobManagerHandler.py,sha256=8R4St1HhJh-NFbyKWkZz4L9a7ZhwspJDymFGzS0qyV8,528
 DIRAC/WorkloadManagementSystem/Service/TornadoJobMonitoringHandler.py,sha256=53m2Mi_yqo-bkouXKUHidI81KwT_Rk2IuWEDw4Z7Wm0,463
@@ -1297,9 +1297,9 @@ DIRAC/tests/Workflow/Integration/exe-script.py,sha256=B_slYdTocEzqfQLRhwuPiLyYUn
 DIRAC/tests/Workflow/Integration/helloWorld.py,sha256=tBgEHH3ZF7ZiTS57gtmm3DW-Qxgm_57HWHpM-Y8XSws,205
 DIRAC/tests/Workflow/Regression/helloWorld.py,sha256=69eCgFuVSYo-mK3Dj2dw1c6g86sF5FksKCf8V2aGVoM,509
 DIRAC/tests/Workflow/Regression/helloWorld.xml,sha256=xwydIcFTAHIX-YPfQfyxuQ7hzvIO3IhR3UAF7ORgkGg,5310
-dirac-9.0.0a60.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
-dirac-9.0.0a60.dist-info/METADATA,sha256=SNxluakCtKWSHyDq1jPhCq0Y5P8JHLbwbZC31TwpvSo,9957
-dirac-9.0.0a60.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dirac-9.0.0a60.dist-info/entry_points.txt,sha256=rTtMPd5AGCg3zNaKE60PuEVFkSRzQlRG-DC_v9FCylM,16824
-dirac-9.0.0a60.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
-dirac-9.0.0a60.dist-info/RECORD,,
+dirac-9.0.0a61.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
+dirac-9.0.0a61.dist-info/METADATA,sha256=H6Ckm6zVriQeSOPVbrewj7nnpfppc3J3uNdGO819_i8,9957
+dirac-9.0.0a61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dirac-9.0.0a61.dist-info/entry_points.txt,sha256=rTtMPd5AGCg3zNaKE60PuEVFkSRzQlRG-DC_v9FCylM,16824
+dirac-9.0.0a61.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
+dirac-9.0.0a61.dist-info/RECORD,,