DIRAC 9.0.15__py3-none-any.whl → 9.0.16__py3-none-any.whl

DIRAC/Core/Tornado/Client/private/TornadoBaseClient.py

@@ -599,7 +599,7 @@ class TornadoBaseClient:
             if url not in self.__bannedUrls:
                 self.__bannedUrls += [url]
             if retry < self.__nbOfUrls - 1:
-                self._request(retry=retry + 1, outputFile=outputFile, **kwargs)
+                return self._request(retry=retry + 1, outputFile=outputFile, **kwargs)
 
             errStr = f"{str(e)}: {rawText}"
             return S_ERROR(errStr)

DIRAC/Resources/Computing/SingularityComputingElement.py

@@ -421,7 +421,7 @@ class SingularityComputingElement(ComputingElement):
         # if there's a max RAM available to the job, use that
         if self.maxRAM:
             self.ceParameters["MemoryLimitMB"] = min(
-                self.maxRAM, self.ceParameters.get("MemoryLimitMB", 1024 * 1024)
+                self.maxRAM, int(self.ceParameters.get("MemoryLimitMB", 1024 * 1024))
             )  # 1024 * 1024 is an arbitrary large number
         result = CG2Manager().systemCall(
             0, cmd, callbackFunction=self.sendOutput, env=self.__getEnv(), ceParameters=self.ceParameters

DIRAC/WorkloadManagementSystem/Service/JobManagerHandler.py

@@ -354,7 +354,13 @@ class JobManagerHandlerMixin:
         validJobList, invalidJobList, nonauthJobList, ownerJobList = self.jobPolicy.evaluateJobRights(
             jobList, RIGHT_RESCHEDULE
         )
-        res = rescheduleJobs(validJobList, source="JobManager")
+        res = rescheduleJobs(
+            validJobList,
+            source="JobManager",
+            jobDB=self.jobDB,
+            taskQueueDB=self.taskQueueDB,
+            jobLoggingDB=self.jobLoggingDB,
+        )
         if not res["OK"]:
             self.log.error(res["Message"])
 

DIRAC/WorkloadManagementSystem/Utilities/JobParameters.py

@@ -242,7 +242,7 @@ def getAvailableRAM(siteName=None, gridCE=None, queue=None):
         gLogger.info("Looking in", csPath)
         availableRAM = gConfig.getValue(csPath, None)
         if availableRAM:
-            return availableRAM
+            return int(availableRAM)
 
     # 3) checks if 'WholeNode' is one of the used tags
     # Tags of the CE
@@ -277,6 +277,6 @@ def getRAMForJob(jobID):
     # from /Resources/Computing/JobLimits/jobID/MaxRAM (set by PoolComputingElement)
     ram = gConfig.getValue(f"Resources/Computing/JobLimits/{jobID}/MaxRAM")
     if ram:
-        return ram
+        return int(ram)
 
     return getAvailableRAM()

DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py

@@ -208,12 +208,13 @@ class PilotCStoJSONSynchronizer:
         if defaultSetup:
             pilotDict["DefaultSetup"] = defaultSetup
 
-        self.log.debug("From DIRAC/Configuration")
-        configurationServers = gConfig.getServersList()
-        if not includeMasterCS:
-            masterCS = gConfigurationData.getMasterServer()
-            configurationServers = exclude_master_cs_aliases(configurationServers, masterCS)
-
+        configurationServers = Operations().getValue("Pilot/OverrideConfigurationServers", [])
+        if not configurationServers:
+            self.log.debug("From DIRAC/Configuration")
+            configurationServers = gConfig.getServersList()
+            if not includeMasterCS:
+                masterCS = gConfigurationData.getMasterServer()
+                configurationServers = exclude_master_cs_aliases(configurationServers, masterCS)
         pilotDict["ConfigurationServers"] = configurationServers
 
         preferredURLPatterns = gConfigurationData.extractOptionFromCFG("/DIRAC/PreferredURLPatterns")

DIRAC/WorkloadManagementSystem/Utilities/Utils.py

@@ -118,12 +118,21 @@ def createJobWrapper(
     return S_OK(generatedFiles)
 
 
-def rescheduleJobs(jobIDs: list[int], source: str = "") -> dict:
+def rescheduleJobs(
+    jobIDs: list[int],
+    source: str = "",
+    jobDB: JobDB | None = None,
+    taskQueueDB: TaskQueueDB | None = None,
+    jobLoggingDB: JobLoggingDB | None = None,
+) -> dict:
     """Utility to reschedule jobs (not atomic, nor bulk)
     Requires direct access to the JobDB and TaskQueueDB
 
     :param jobIDs: list of jobIDs
     :param source: source of the reschedule
+    :param jobDB: optional JobDB instance to reuse (creates new if not provided)
+    :param taskQueueDB: optional TaskQueueDB instance to reuse (creates new if not provided)
+    :param jobLoggingDB: optional JobLoggingDB instance to reuse (creates new if not provided)
     :return: S_OK/S_ERROR
     :rtype: dict
 
@@ -131,13 +140,21 @@ def rescheduleJobs(jobIDs: list[int], source: str = "") -> dict:
 
     failedJobs = []
 
+    # Reuse provided DB instances or create new ones
+    if jobDB is None:
+        jobDB = JobDB()
+    if taskQueueDB is None:
+        taskQueueDB = TaskQueueDB()
+    if jobLoggingDB is None:
+        jobLoggingDB = JobLoggingDB()
+
     for jobID in jobIDs:
-        result = JobDB().rescheduleJob(jobID)
+        result = jobDB.rescheduleJob(jobID)
         if not result["OK"]:
             failedJobs.append(jobID)
             continue
-        TaskQueueDB().deleteJob(jobID)
-        JobLoggingDB().addLoggingRecord(
+        taskQueueDB.deleteJob(jobID)
+        jobLoggingDB.addLoggingRecord(
             result["JobID"],
             status=result["Status"],
             minorStatus=result["MinorStatus"],

{dirac-9.0.15.dist-info → dirac-9.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.15
+Version: 9.0.16
 Summary: DIRAC is an interware, meaning a software framework for distributed computing.
 Home-page: https://github.com/DIRACGrid/DIRAC/
 License: GPL-3.0-only
@@ -19,7 +19,7 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: DIRACCommon==v9.0.15
+Requires-Dist: DIRACCommon==v9.0.16
 Requires-Dist: diracx-client>=v0.0.1
 Requires-Dist: diracx-core>=v0.0.1
 Requires-Dist: diracx-cli>=v0.0.1

{dirac-9.0.15.dist-info → dirac-9.0.16.dist-info}/RECORD

@@ -207,7 +207,7 @@ DIRAC/Core/Tornado/__init__.py,sha256=cO7z-h1lVEu7RRPYeY3BZLJu-FZH9p7Gvuukw1ZgcM
 DIRAC/Core/Tornado/Client/ClientSelector.py,sha256=jII2UaAnoyD8ixLML1DLxGDfstmE2rVSqXbgBZJv5ak,4109
 DIRAC/Core/Tornado/Client/TornadoClient.py,sha256=o4x6orUNyqhWG4GbihlHgk_2trjz1F0Zm0xcQ0MaRlo,3869
 DIRAC/Core/Tornado/Client/__init__.py,sha256=cO7z-h1lVEu7RRPYeY3BZLJu-FZH9p7Gvuukw1ZgcME,31
-DIRAC/Core/Tornado/Client/private/TornadoBaseClient.py,sha256=Gp7KyenLZ3Y1-Fow8r2MM5DjkUslXLtQEPfT_Hxl6ng,27704
+DIRAC/Core/Tornado/Client/private/TornadoBaseClient.py,sha256=9kbCFQInMRu6rveHEQNYYxpSnGlbo7kJtSKt4ix2k10,27711
 DIRAC/Core/Tornado/Client/private/__init__.py,sha256=cO7z-h1lVEu7RRPYeY3BZLJu-FZH9p7Gvuukw1ZgcME,31
 DIRAC/Core/Tornado/Server/HandlerManager.py,sha256=IQG2_dufNM43TGqfYU6QOTMlJyPdeCSs7TWqHlAls_Q,8181
 DIRAC/Core/Tornado/Server/TornadoREST.py,sha256=-4_gROsCYPrwHifagoZFqUSfu6mlkk4PMeL9G7NTba0,15884
@@ -910,7 +910,7 @@ DIRAC/Resources/Computing/LocalComputingElement.py,sha256=pELd0UjXTNz4LcnSZOkwG-
 DIRAC/Resources/Computing/PoolComputingElement.py,sha256=WiEKyGBmocOfEFwLbk69jsYyHe5ZQNrgWnb0KE_J91I,11976
 DIRAC/Resources/Computing/SSHBatchComputingElement.py,sha256=3ZEK6AkorZM0Ko32VKrcJ-ywTR0hkn5fBuGrJruEbA4,5953
 DIRAC/Resources/Computing/SSHComputingElement.py,sha256=bBzIkwVNQLgL3NF0wTCur_WudRLLmoGU-RknWQ6aVXs,32669
-DIRAC/Resources/Computing/SingularityComputingElement.py,sha256=a-XQF0tJa_yLhVd1UqpuqkjkqQ_ZjtIciUUPfIGapWI,18336
+DIRAC/Resources/Computing/SingularityComputingElement.py,sha256=t3rbRJQQA4SQk15ZZb5LHs5swlxTiPsnN_cexDhPaGU,18341
 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=CfKZOQqBkX-L4MQfQmVcMuLDkWVe-whG1ZU-FR5Q2Jk,13699
@@ -1221,7 +1221,7 @@ DIRAC/WorkloadManagementSystem/JobWrapper/test/script-RESC.sh,sha256=kiY-Af9a1bs
 DIRAC/WorkloadManagementSystem/JobWrapper/test/script-fail.sh,sha256=f1R0qtgJgOI3AbEoxGBqN8ClA6Y8Bz8tHlBXrxjySDs,63
 DIRAC/WorkloadManagementSystem/JobWrapper/test/script-long.sh,sha256=yzaSDg7P5hGv9SSCBsl8FLuj6-udCcpd0qId9kSv4Nc,41
 DIRAC/WorkloadManagementSystem/JobWrapper/test/script.sh,sha256=fbYLJJTVw9K7f9NdMvW_a-NkBI6SPup4NebPFYFKsbQ,9
-DIRAC/WorkloadManagementSystem/Service/JobManagerHandler.py,sha256=sUNdlsf5sI8GG3yjasSw5GO9OwVGGYIQA1a0Prl9Jd0,21828
+DIRAC/WorkloadManagementSystem/Service/JobManagerHandler.py,sha256=OIidvhvX3eIe19ni8ttaaPWF_fmQgBBel2v5j8U8YMw,21979
 DIRAC/WorkloadManagementSystem/Service/JobMonitoringHandler.py,sha256=sFJOme3KDLeAppH_AF5dTt8om_g_zUSQvPnIs9BAQkc,7586
 DIRAC/WorkloadManagementSystem/Service/JobPolicy.py,sha256=o88xR3roe_JRB5F53oxb1LIuqY2qCCw6w5njprrJFMI,8057
 DIRAC/WorkloadManagementSystem/Service/JobStateUpdateHandler.py,sha256=TiSnLQTNd-HgAhPoqwebzN6G95pVXXgETJ5Hbw29XnY,9226
@@ -1239,14 +1239,14 @@ DIRAC/WorkloadManagementSystem/Service/WMSAdministratorHandler.py,sha256=Hwi6RBQ
 DIRAC/WorkloadManagementSystem/Service/WMSUtilities.py,sha256=VMSOEHkpOrNB_VIGESnxMYdnDjkmR4Qbnf_H7Yp0m88,4528
 DIRAC/WorkloadManagementSystem/Service/__init__.py,sha256=IRaXIxMoS1SbRehm7ONo87SD1l44VBmowjbfkChvdsc,58
 DIRAC/WorkloadManagementSystem/Utilities/JobModel.py,sha256=jN9sFbzMZo9tab6Kp7OeBCMCrfx21gCqRbm1XjLxong,1781
-DIRAC/WorkloadManagementSystem/Utilities/JobParameters.py,sha256=WftHMrIZ1t78C2HPoOQp-TkjeZ96giSy_A5TPkMaT6Y,11629
+DIRAC/WorkloadManagementSystem/Utilities/JobParameters.py,sha256=eUvSzAyGLcIG2l9q_Mp8q-14N05PXRMop48zjMxYjAI,11639
 DIRAC/WorkloadManagementSystem/Utilities/JobStatusUtility.py,sha256=WtGJzC7fHvydANh8JH6e1Kk_jebrCMPr2c5cw3ufjm8,7826
 DIRAC/WorkloadManagementSystem/Utilities/ParametricJob.py,sha256=FNUsGhvsFVrtmA7r8G-sd4QTMeBkqG1sdtwiBUKQyd0,605
-DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py,sha256=ZQk2tD40986awO9pae1zmdPEWlnMJt4m61Z_RU3LWl8,12476
+DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py,sha256=8pI4-FMwBFrrdFJ5izJm__UGR7Gt9dPsRQRwuofXbEQ,12627
 DIRAC/WorkloadManagementSystem/Utilities/PilotWrapper.py,sha256=VcvQTpeyTbVYqSsPQDyAt37N2CaEAnIuvbR6yk4kYk8,15465
 DIRAC/WorkloadManagementSystem/Utilities/QueueUtilities.py,sha256=HSa2EGSa03dxD6DFk6UDe87Yz0qOz0vMfyUYb2x_-Kg,12076
 DIRAC/WorkloadManagementSystem/Utilities/RemoteRunner.py,sha256=wSHit3b-Z6vuOIXH1U_mS24FBYR3zXw4Q5Utk1MWjnA,12159
-DIRAC/WorkloadManagementSystem/Utilities/Utils.py,sha256=A6M-GnyC5LXeO0pJxwzqNdLjZLMC3WZ1o7dVFXumrsU,5331
+DIRAC/WorkloadManagementSystem/Utilities/Utils.py,sha256=jAMlmxYEhduaMyMx9mUhjg8yOo_nw7ANCJ9o1E3DVPw,5958
 DIRAC/WorkloadManagementSystem/Utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/WorkloadManagementSystem/Utilities/jobAdministration.py,sha256=uLgB0QLFPKUlZoWCOJYtQHaKykgCpodalHnMWpGld4s,548
 DIRAC/WorkloadManagementSystem/Utilities/test/Test_JobModel.py,sha256=coRtGksgrKIdodk7QFn-AjODBJBLfiH0Sf7I2F0rpbI,8040
@@ -1296,9 +1296,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.15.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
-dirac-9.0.15.dist-info/METADATA,sha256=uLMgTz4woTQZXHcH7OnLP_AjPb5N0mHqR0x_H2JmTKY,10039
-dirac-9.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dirac-9.0.15.dist-info/entry_points.txt,sha256=hupzIL8aVmjK3nn7RLKdhcaiPmLOiD3Kulh3CSDHKmw,16492
-dirac-9.0.15.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
-dirac-9.0.15.dist-info/RECORD,,
+dirac-9.0.16.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
+dirac-9.0.16.dist-info/METADATA,sha256=Z62NtRQYwvXnj2wongUVv3A5m50jd9Ty9bDCI9cmIPU,10039
+dirac-9.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dirac-9.0.16.dist-info/entry_points.txt,sha256=hupzIL8aVmjK3nn7RLKdhcaiPmLOiD3Kulh3CSDHKmw,16492
+dirac-9.0.16.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
+dirac-9.0.16.dist-info/RECORD,,