Merge pull request #6987 from aldbr/rel-v7r3_FIX_RemoteRunnerExitCode

[v7r3] fix: return a specific error code in RemoteRunner in case of failure

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Utilities/RemoteRunner.py

@@ -13,6 +13,7 @@
 
 from DIRAC import gLogger, gConfig, S_OK, S_ERROR
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
+from DIRAC.Core.Utilities import DErrno
 from DIRAC.Core.Utilities.Decorators import deprecated
 from DIRAC.Resources.Computing.ComputingElementFactory import ComputingElementFactory
 from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getQueue
@@ -63,7 +64,7 @@ def execute(self, command, workingDirectory=".", numberOfProcessors=1, cleanRemo
         # Check whether CE parameters are set
         result = self._checkParameters()
         if not result["OK"]:
-            result["Value"] = (-1, "", result["Message"])
+            result["Errno"] = DErrno.ESECTION
             return result
         self.log.verbose(
             "The command will be sent to",
@@ -73,7 +74,7 @@ def execute(self, command, workingDirectory=".", numberOfProcessors=1, cleanRemo
         # Set up Application Queue
         result = self._setUpWorkloadCE(numberOfProcessors)
         if not result["OK"]:
-            result["Value"] = (-1, "", result["Message"])
+            result["Errno"] = DErrno.ERESUNA
             return result
         workloadCE = result["Value"]
         self.log.debug("The CE interface has been set up")
@@ -93,7 +94,7 @@ def execute(self, command, workingDirectory=".", numberOfProcessors=1, cleanRemo
         # Submit the command as a job
         result = workloadCE.submitJob(executable, workloadCE.proxy, inputs=inputs, outputs=outputs)
         if not result["OK"]:
-            result["Value"] = (-1, "", result["Message"])
+            result["Errno"] = DErrno.EWMSSUBM
             return result
         jobID = result["Value"][0]
         stamp = result["PilotStampDict"][jobID]
@@ -104,24 +105,23 @@ def execute(self, command, workingDirectory=".", numberOfProcessors=1, cleanRemo
             time.sleep(120)
             result = workloadCE.getJobStatus([jobID])
             if not result["OK"]:
-                result["Value"] = (-1, "", result["Message"])
+                result["Errno"] = DErrno.EWMSSTATUS
                 return result
             jobStatus = result["Value"][jobID]
         self.log.verbose("The final status of the application/script is: ", jobStatus)
 
         # Get job outputs
         result = workloadCE.getJobOutput("%s:::%s" % (jobID, stamp), os.path.abspath("."))
         if not result["OK"]:
-            result["Value"] = (-1, "", result["Message"])
+            result["Errno"] = DErrno.EWMSJMAN
             return result
         output, error = result["Value"]
 
-        # Clean job on the remote resource
+        # Clean job in the remote resource
         if cleanRemoteJob:
             result = workloadCE.cleanJob(jobID)
             if not result["OK"]:
-                result["Value"] = (-1, "", result["Message"])
-                return result
+                self.log.warn("Failed to clean the output remotely", result["Message"])
 
         commandStatus = {"Done": 0, "Failed": -1, "Killed": -2}
         return S_OK((commandStatus[jobStatus], output, error))