DIRAC 9.0.0a69__py3-none-any.whl → 9.0.0a70__py3-none-any.whl

DIRAC/WorkloadManagementSystem/Service/WMSAdministratorHandler.py

@@ -150,37 +150,24 @@ class WMSAdministratorHandlerMixin:
         :param str jobID: job ID
         :return: S_OK(dict)/S_ERROR()
         """
-        pilotReference = ""
-        # Get the pilot grid reference first from the job parameters
-
-        credDict = self.getRemoteCredentials()
-        vo = credDict.get("VO", Registry.getVOForGroup(credDict["group"]))
-        res = self.elasticJobParametersDB.getJobParameters(int(jobID), vo=vo, paramList=["Pilot_Reference"])
-        if not res["OK"]:
-            return res
-        if res["Value"].get(int(jobID)):
-            pilotReference = res["Value"][int(jobID)]["Pilot_Reference"]
-
-        if not pilotReference:
-            res = self.jobDB.getJobParameter(int(jobID), "Pilot_Reference")
-            if not res["OK"]:
-                return res
-            pilotReference = res["Value"]
-
-        if not pilotReference:
-            # Failed to get the pilot reference, try to look in the attic parameters
-            res = self.jobDB.getAtticJobParameters(int(jobID), ["Pilot_Reference"])
-            if res["OK"]:
-                c = -1
-                # Get the pilot reference for the last rescheduling cycle
-                for cycle in res["Value"]:
-                    if cycle > c:
-                        pilotReference = res["Value"][cycle]["Pilot_Reference"]
-                        c = cycle
-
-        if pilotReference:
-            return self.pilotManager.getPilotOutput(pilotReference)
-        return S_ERROR("No pilot job reference found")
+        result = self.pilotManager.getPilots(jobID)
+
+        if not result["OK"]:
+            return result
+        pilotJobReferences = result["Value"].keys()
+
+        outputs = {"StdOut": "", "StdErr": ""}
+        for pilotRef in pilotJobReferences:
+            result = self.pilotManager.getPilotOutput(pilotRef)
+            if not result["OK"]:
+                stdout = f"Could not retrieve output: {result['Message']}"
+                error = f"Could not retrieve error: {result['Message']}"
+            else:
+                stdout, error = result["Value"]["StdOut"], result["Value"]["StdErr"]
+            outputs["StdOut"] += f"# PilotJobReference: {pilotRef}\n\n{stdout}\n"
+            outputs["StdErr"] += f"# PilotJobReference: {pilotRef}\n\n{error}\n"
+
+        return S_OK(outputs)
 
 
 class WMSAdministratorHandler(WMSAdministratorHandlerMixin, RequestHandler):

DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py

@@ -11,7 +11,6 @@ import os
 import shutil
 import tarfile
 from typing import Any
-
 from git import Repo
 
 from DIRAC import S_OK, gConfig, gLogger
@@ -217,6 +216,10 @@ class PilotCStoJSONSynchronizer:
 
         pilotDict["ConfigurationServers"] = configurationServers
 
+        preferredURLPatterns = gConfigurationData.extractOptionFromCFG("/DIRAC/PreferredURLPatterns")
+        if preferredURLPatterns:
+            pilotDict["PreferredURLPatterns"] = preferredURLPatterns.replace(" ", "").split(",")
+
         self.log.debug("Got pilotDict", str(pilotDict))
 
         return S_OK(pilotDict)

{dirac-9.0.0a69.dist-info → dirac-9.0.0a70.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.0a69
+Version: 9.0.0a70
 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,9 +19,10 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: DIRACCommon==v9.0.0a69
-Requires-Dist: diracx-client>=v0.0.1a18
-Requires-Dist: diracx-core>=v0.0.1a18
+Requires-Dist: DIRACCommon==v9.0.0a70
+Requires-Dist: diracx-client>=v0.0.1
+Requires-Dist: diracx-core>=v0.0.1
+Requires-Dist: diracx-cli>=v0.0.1
 Requires-Dist: db12
 Requires-Dist: fts3
 Requires-Dist: gfal2-python
@@ -40,13 +41,13 @@ Requires-Dist: python-dateutil
 Requires-Dist: pytz
 Requires-Dist: requests
 Requires-Dist: rucio-clients>=34.4.2
-Requires-Dist: setuptools
 Requires-Dist: sqlalchemy
 Requires-Dist: typing_extensions>=4.3.0
 Requires-Dist: Authlib>=1.0.0.a2
 Requires-Dist: pyjwt
 Requires-Dist: dominate
 Requires-Dist: zstandard
+Requires-Dist: xattr
 Provides-Extra: server
 Requires-Dist: CMRESHandler; extra == "server"
 Requires-Dist: opensearch-py; extra == "server"