fix: Few fixes, and removed pilot logs related features

Author: Robin VAN DE MERGHEL

src/DIRAC/Core/Tornado/Client/ClientSelector.py

@@ -66,10 +66,12 @@ def ClientSelector(disetClient, *args, **kwargs):  # We use same interface as RP
         # If we are not already given a URL, resolve it
         if serviceName.startswith(("http", "dip")):
             completeUrl = serviceName
-        elif useLegacyAdapter(serviceName) and diracxClient is not None:
-            return diracxClient()
         else:
-            if diracxClient:
+            isServiceLegacyAdapted = useLegacyAdapter(serviceName)
+
+            if isServiceLegacyAdapted and diracxClient is not None:
+                return diracxClient()
+            elif isServiceLegacyAdapted:
                 # Only warn to deactivate it without making the code crash.
                 sLog.warn("DiracX is enabled but no diracxClient is provided, do you need to update your client?")
 

src/DIRAC/Interfaces/API/DiracAdmin.py

@@ -368,63 +368,6 @@ def getJobPilotOutput(self, jobID, directory=""):
         self.log.always(f"Outputs retrieved in {outputPath}")
         return result
 
-    #############################################################################
-    def getPilotOutput(self, gridReference, directory=""):
-        """Retrieve the pilot output  (std.out and std.err) for an existing pilot reference.
-
-          >>> gLogger.notice(dirac.getJobPilotOutput(12345))
-          {'OK': True, 'Value': {}}
-
-        :param str gridReference: pilot reference
-        :param str directory: a directory to download logs to.
-        :return: S_OK,S_ERROR
-        """
-        if not isinstance(gridReference, str):
-            return self._errorReport("Expected string for pilot reference")
-
-        if not directory:
-            directory = self.currentDir
-
-        if not os.path.exists(directory):
-            return self._errorReport(f"Directory {directory} does not exist")
-
-        result = PilotManagerClient().getPilotOutput(gridReference)
-        if not result["OK"]:
-            return result
-
-        gridReferenceSmall = gridReference.split("/")[-1]
-        if not gridReferenceSmall:
-            gridReferenceSmall = "reference"
-        outputPath = f"{directory}/pilot_{gridReferenceSmall}"
-
-        if os.path.exists(outputPath):
-            self.log.info(f"Remove {outputPath} and retry to continue")
-            return S_ERROR(f"Remove {outputPath} and retry to continue")
-
-        if not os.path.exists(outputPath):
-            self.log.verbose(f"Creating directory {outputPath}")
-            os.mkdir(outputPath)
-
-        outputs = result["Value"]
-        if "StdOut" in outputs:
-            stdout = f"{outputPath}/std.out"
-            with open(stdout, "w") as fopen:
-                fopen.write(outputs["StdOut"])
-            self.log.info(f"Standard output written to {stdout}")
-        else:
-            self.log.warn("No standard output returned")
-
-        if "StdErr" in outputs:
-            stderr = f"{outputPath}/std.err"
-            with open(stderr, "w") as fopen:
-                fopen.write(outputs["StdErr"])
-            self.log.info(f"Standard error written to {stderr}")
-        else:
-            self.log.warn("No standard error returned")
-
-        self.log.always(f"Outputs retrieved in {outputPath}")
-        return result
-
     #############################################################################
     def getPilotInfo(self, gridReference):
         """Retrieve info relative to a pilot reference
@@ -478,22 +421,6 @@ def killPilot(self, gridReference):
 
         return killPilotsInQueues(pilotRefDict)
 
-    #############################################################################
-    def getPilotLoggingInfo(self, gridReference):
-        """Retrieve the pilot logging info for an existing job in the WMS.
-
-          >>> gLogger.notice(dirac.getPilotLoggingInfo(12345))
-          {'OK': True, 'Value': {"The output of the command"}}
-
-        :param gridReference: Gridp pilot job reference Id
-        :type gridReference: string
-        :return: S_OK,S_ERROR
-        """
-        if not isinstance(gridReference, str):
-            return self._errorReport("Expected string for pilot reference")
-
-        return PilotManagerClient().getPilotLoggingInfo(gridReference)
-
     #############################################################################
     def getJobPilots(self, jobID):
         """Extract the list of submitted pilots and their status for a given

src/DIRAC/Interfaces/scripts/dirac_admin_get_pilot_logging_info.py

@@ -4,6 +4,7 @@
 import datetime
 import shutil
 
+from DIRAC.Core.Utilities.Decorators import deprecated
 import DIRAC.Core.Utilities.TimeUtilities as TimeUtilities
 from DIRAC import S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
@@ -41,6 +42,7 @@ def initializeHandler(cls, serviceInfoDict):
 
     types_getPilotOutput = [str]
 
+    @deprecated("Rewritten in DiracX")
     def export_getPilotOutput(self, pilotReference):
         """
         Get the pilot job standard output and standard error files for a pilot reference.
@@ -169,6 +171,7 @@ def _getRemotePilotOutput(self, pilotReference, pilotDict):
     ##############################################################################
     types_getPilotLoggingInfo = [str]
 
+    @deprecated("Rewritten in DiracX")
     def export_getPilotLoggingInfo(self, pilotReference):
         """Get the pilot logging info for the Grid job reference"""
         result = self.pilotAgentsDB.getPilotInfo(pilotReference)

src/DIRAC/Interfaces/scripts/dirac_admin_get_pilot_output.py

@@ -178,8 +178,6 @@ def export_getJobPilotOutput(self, jobID):
                         pilotReference = res["Value"][cycle]["Pilot_Reference"]
                         c = cycle
 
-        if pilotReference:
-            return self.pilotManager.getPilotOutput(pilotReference)
         return S_ERROR("No pilot job reference found")
 
 

src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py

@@ -46,8 +46,7 @@ def test_PilotsDB():
     assert res["Value"]["anotherPilot"]["AccountingSent"] == "False"
     assert res["Value"]["anotherPilot"]["PilotJobReference"] == "anotherPilot"
 
-    # >>> TODO: Implement me
-    # res = pilots.getPilotSummary("", "")
+    # res = pilots.getPilotSummary("", "") # Did not understand this one
     # assert res["OK"], res["Message"]
     # assert res["Value"]["Total"]["Submitted"] >= 1
 

src/DIRAC/WorkloadManagementSystem/Service/WMSAdministratorHandler.py

@@ -78,7 +78,7 @@ def main(url: str, disabled_vos: list[str], legacy_adapted_services: list[str]):
     for service in legacy_adapted_services:
         print(f"Adding legacy adaptor for service {service}")
         # Service name such as:  system/name
-        system, name = service.split(" ")
+        system, name = service.split("/")
 
         if not system in legacy["LegacyClientEnabled"]:
             legacy["LegacyClientEnabled"][system] = {}