feat: Download files with a shifter proxy (handler modiff)

martynia · Aug 15, 2023 · 12e3595 · 12e3595
1 parent 98a1272
commit 12e3595
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/DIRAC/WorkloadManagementSystem/Client/PilotLoggingPlugins/FileCacheDownloadPlugin.py b/src/DIRAC/WorkloadManagementSystem/Client/PilotLoggingPlugins/FileCacheDownloadPlugin.py
@@ -53,9 +53,9 @@ def getRemotePilotLogs(self, pilotStamp, vo=None):
 
         sLog.info(f"Proxy used for retrieving pilot logs: VO: {vo}, User: {proxyUser}, Group: {proxyGroup}")
 
-        res = self._downloadLogs(
+        res = self._downloadLogs(  # pylint: disable=unexpected-keyword-arg
             lfn, filepath, proxyUserName=proxyUser, proxyUserGroup=proxyGroup
-        )  # pylint: disable=unexpected-keyword-arg
+        )
         sLog.debug("getFile result:", res)
         if not res["OK"]:
             sLog.error(f"Failed to contact storage")

diff --git a/src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py b/src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py
@@ -7,6 +7,7 @@
 
 from DIRAC import S_OK, S_ERROR
 import DIRAC.Core.Utilities.TimeUtilities as TimeUtilities
+from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getUsernameForDN, getDNForUsername, getVOForGroup
 from DIRAC.Core.DISET.RequestHandler import getServiceOption
 from DIRAC.Core.DISET.RequestHandler import RequestHandler
@@ -33,6 +34,9 @@ def initializeHandler(cls, serviceInfoDict):
 
         except RuntimeError as excp:
             return S_ERROR(f"Can't connect to DB: {excp}")
+        # classic or remote first ?
+        opsHelper = Operations(vo=vo, setup=self.setup)
+        uploadPath = opsHelper.getValue("Pilot/UploadPath", "")
         # prepare remote pilot plugin initialization
         defaultOption, defaultClass = "DownloadPlugin", "FileCacheDownloadPlugin"
         cls.configValue = getServiceOption(serviceInfoDict, defaultOption, defaultClass)
@@ -181,6 +185,7 @@ def export_getRemotePilotOutput(self, pilotReference):
         pilotStamp = pilotDict["PilotStamp"]
         owner = pilotDict["OwnerDN"]
         group = pilotDict["OwnerGroup"]
+        vo = getVOForGroup(group)
 
         if self.loggingPlugin is None:
             result = ObjectLoader().loadObject(
@@ -194,15 +199,7 @@ def export_getRemotePilotOutput(self, pilotReference):
             self.loggingPlugin = componentClass()
             self.log.info("Loaded: PilotLoggingPlugin class", self.configValue)
 
-        remoteCredentials = self.getRemoteCredentials()
-        proxyUser = remoteCredentials["user"]
-        proxyGroup = remoteCredentials["group"]
-        vo = getVOForGroup(proxyGroup)
-        self.log.info(f"Proxy used for retrieving pilot logs: VO: {vo}, User: {proxyUser}, Group: {proxyGroup}")
-
-        res = self.loggingPlugin.getRemotePilotLogs(
-            pilotStamp, vo, proxyUserName=proxyUser, proxyUserGroup=proxyGroup
-        )  # pylint: disable=unexpected-keyword-arg
+        res = self.loggingPlugin.getRemotePilotLogs(pilotStamp, vo)
 
         if res["OK"]:
             res["Value"]["OwnerDN"] = owner