fix: JobAgent.setupProxy takes owner instead of ownerDN

aldbr · Feb 28, 2024 · 71a2d2b · 71a2d2b
1 parent 222f951
commit 71a2d2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py b/src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py
@@ -265,8 +265,7 @@ def execute(self):
                 )
 
         self.jobs[jobID]["JobReport"].setJobStatus(minorStatus="Job Received by Agent", sendFlag=False)
-        ownerDN = getDNForUsername(owner)["Value"][0]
-        result_setupProxy = self._setupProxy(ownerDN, jobGroup)
+        result_setupProxy = self._setupProxy(owner, jobGroup)
         if not result_setupProxy["OK"]:
             result = self._rescheduleFailedJob(jobID, result_setupProxy["Message"])
             return self._finish(result["Message"], self.stopOnApplicationFailure)
@@ -465,10 +464,11 @@ def _updateConfiguration(self, key, value, path="/LocalSite"):
         localCfg.writeToFile(localConfigFile)
 
     #############################################################################
-    def _setupProxy(self, ownerDN, ownerGroup):
+    def _setupProxy(self, owner, ownerGroup):
         """
         Retrieve a proxy for the execution of the job
         """
+        ownerDN = getDNForUsername(owner)["Value"][0]
         if gConfig.getValue("/DIRAC/Security/UseServerCertificate", False):
             proxyResult = self._requestProxyFromProxyManager(ownerDN, ownerGroup)
             if not proxyResult["OK"]:

diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/PushJobAgent.py b/src/DIRAC/WorkloadManagementSystem/Agent/PushJobAgent.py
@@ -154,11 +154,7 @@ def execute(self):
             if not result["OK"]:
                 return result
             proxy = result["Value"]
-            result = proxy.getRemainingSecs()  # pylint: disable=no-member
-            if not result["OK"]:
-                return result
-            lifetime_secs = result["Value"]
-            ce.setProxy(proxy, lifetime_secs)
+            ce.setProxy(proxy)
 
             # Check that there is enough slots in the remote CE to match a job
             result = self._checkCEAvailability(ce)
@@ -232,8 +228,7 @@ def execute(self):
                 )
 
                 # Setup proxy
-                ownerDN = getDNForUsername(owner)["Value"]
-                result_setupProxy = self._setupProxy(ownerDN, jobGroup)
+                result_setupProxy = self._setupProxy(owner, jobGroup)
                 if not result_setupProxy["OK"]:
                     result = self._rescheduleFailedJob(jobID, result_setupProxy["Message"])
                     self.failedQueues[queueName] += 1