feat: add a remote pilot option for getJobPilotOutut calls

DIRACGrid · Jul 11, 2023 · c6ce915 · c6ce915
1 parent 7ef7644
commit c6ce915
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/DIRAC/Interfaces/API/DiracAdmin.py b/src/DIRAC/Interfaces/API/DiracAdmin.py
@@ -431,7 +431,7 @@ def resetJob(self, jobID):
         return result
 
     #############################################################################
-    def getJobPilotOutput(self, jobID, directory=""):
+    def getJobPilotOutput(self, jobID, directory="", remote=False):
         """Retrieve the pilot output for an existing job in the WMS.
         The output will be retrieved in a local directory unless
         otherwise specified.
@@ -441,6 +441,8 @@ def getJobPilotOutput(self, jobID, directory=""):
 
         :param job: JobID
         :type job: integer or string
+        :param str directory: a directory to download logs to.
+        :param bool remote: if True a remote storage is used, otherwise classic CE logs
         :return: S_OK,S_ERROR
         """
         if not directory:

diff --git a/src/DIRAC/WorkloadManagementSystem/Service/WMSAdministratorHandler.py b/src/DIRAC/WorkloadManagementSystem/Service/WMSAdministratorHandler.py
@@ -173,11 +173,12 @@ def export_getSiteMaskSummary(cls):
     ##############################################################################
     types_getJobPilotOutput = [[str, int]]
 
-    def export_getJobPilotOutput(self, jobID):
+    def export_getJobPilotOutput(self, jobID, remote=False):
         """Get the pilot job standard output and standard error files for the DIRAC
         job reference
 
         :param str jobID: job ID
+        :param bool remote: if True a remote storage is used, otherwise classic CE logs
 
         :return: S_OK(dict)/S_ERROR()
         """
@@ -209,7 +210,7 @@ def export_getJobPilotOutput(self, jobID):
                         c = cycle
 
         if pilotReference:
-            return self.pilotManager.getPilotOutput(pilotReference)
+            return self.pilotManager.getPilotOutput(pilotReference, remote=remote)
         return S_ERROR("No pilot job reference found")
 
     ##############################################################################