fix: use proxy only in case it is set up in the CE

Author: atsareg

src/DIRAC/Resources/Computing/AREXComputingElement.py

@@ -356,11 +356,12 @@ def _killJob(self, arcJobList):
             return S_ERROR("REST interface not initialised. Cannot kill jobs.")
 
         # Get a proxy
-        result = self._prepareProxy()
-        if not result["OK"]:
-            self.log.error("Failed to set up proxy", result["Message"])
-            return result
-        self.session.cert = Locations.getProxyLocation()
+        if self.proxy:
+            result = self._prepareProxy()
+            if not result["OK"]:
+                self.log.error("Failed to set up proxy", result["Message"])
+                return result
+            self.session.cert = Locations.getProxyLocation()
 
         # List of jobs in json format for the REST query
         jobsJson = {"job": [{"id": job} for job in arcJobList]}
@@ -393,11 +394,12 @@ def submitJob(self, executableFile, proxy, numberOfJobs=1, inputs=None, outputs=
         self.log.verbose("Executable file path:", executableFile)
 
         # Get a proxy
-        result = self._prepareProxy()
-        if not result["OK"]:
-            self.log.error("Failed to set up proxy", result["Message"])
-            return result
-        self.session.cert = Locations.getProxyLocation()
+        if self.proxy:
+            result = self._prepareProxy()
+            if not result["OK"]:
+                self.log.error("Failed to set up proxy", result["Message"])
+                return result
+            self.session.cert = Locations.getProxyLocation()
 
         # Get a "delegation" and use the same delegation for all the jobs
         delegation = ""
@@ -476,11 +478,12 @@ def getCEStatus(self):
             return S_ERROR("REST interface not initialised. Cannot get CE status.")
 
         # Get a proxy
-        result = self._prepareProxy()
-        if not result["OK"]:
-            self.log.error("Failed to set up proxy", result["Message"])
-            return result
-        self.session.cert = Locations.getProxyLocation()
+        if self.proxy:
+            result = self._prepareProxy()
+            if not result["OK"]:
+                self.log.error("Failed to set up proxy", result["Message"])
+                return result
+            self.session.cert = Locations.getProxyLocation()
 
         # Try to find out which VO we are running for.
         # Essential now for REST interface.
@@ -597,11 +600,12 @@ def getJobStatus(self, jobIDList):
             return S_ERROR("REST interface not initialised. Cannot get job status.")
 
         # Get a proxy
-        result = self._prepareProxy()
-        if not result["OK"]:
-            self.log.error("AREXComputingElement: failed to set up proxy", result["Message"])
-            return result
-        self.session.cert = Locations.getProxyLocation()
+        if self.proxy:
+            result = self._prepareProxy()
+            if not result["OK"]:
+                self.log.error("AREXComputingElement: failed to set up proxy", result["Message"])
+                return result
+            self.session.cert = Locations.getProxyLocation()
 
         if not isinstance(jobIDList, list):
             jobIDList = [jobIDList]
@@ -688,11 +692,12 @@ def getJobLog(self, jobID):
             return S_ERROR("REST interface not initialised. Cannot get job output.")
 
         # Get a proxy
-        result = self._prepareProxy()
-        if not result["OK"]:
-            self.log.error("AREXComputingElement: failed to set up proxy", result["Message"])
-            return result
-        self.session.cert = Locations.getProxyLocation()
+        if self.proxy:
+            result = self._prepareProxy()
+            if not result["OK"]:
+                self.log.error("AREXComputingElement: failed to set up proxy", result["Message"])
+                return result
+            self.session.cert = Locations.getProxyLocation()
 
         # Extract stamp from the Job ID
         if ":::" in jobID:
@@ -749,11 +754,12 @@ def getJobOutput(self, jobID, workingDirectory=None):
             return S_ERROR("REST interface not initialised. Cannot get job output.")
 
         # Get a proxy
-        result = self._prepareProxy()
-        if not result["OK"]:
-            self.log.error("AREXComputingElement: failed to set up proxy", result["Message"])
-            return result
-        self.session.cert = Locations.getProxyLocation()
+        if self.proxy:
+            result = self._prepareProxy()
+            if not result["OK"]:
+                self.log.error("AREXComputingElement: failed to set up proxy", result["Message"])
+                return result
+            self.session.cert = Locations.getProxyLocation()
 
         # Extract stamp from the Job ID
         if ":::" in jobID:

src/DIRAC/Resources/Computing/ComputingElement.py

@@ -91,20 +91,13 @@ def setToken(self, token, valid=0):
 
     def _prepareProxy(self):
         """Set the environment variable X509_USER_PROXY"""
-        if not self.proxy:
-            result = getProxyInfo()
-            if not result["OK"]:
-                return S_ERROR("No proxy available")
-            if "path" in result["Value"]:
-                os.environ["X509_USER_PROXY"] = result["Value"]["path"]
-                return S_OK()
-        else:
+        if self.proxy:
             result = gProxyManager.dumpProxyToFile(self.proxy, requiredTimeLeft=self.minProxyTime)
             if not result["OK"]:
                 return result
             os.environ["X509_USER_PROXY"] = result["Value"]
 
-        self.log.debug(f"Set proxy variable X509_USER_PROXY to {os.environ['X509_USER_PROXY']}")
+            self.log.debug(f"Set proxy variable X509_USER_PROXY to {os.environ['X509_USER_PROXY']}")
         return S_OK()
 
     def isProxyValid(self, valid=1000):