Merge pull request #7788 from fstagni/80_sshCE_result_test

[8.0] SSHComputingElement fix: added check of result
DIRACGrid · Sep 13, 2024 · 062a670 · 062a670
2 parents 93ad940 + c42ff89
commit 062a670
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/DIRAC/Resources/Computing/SSHComputingElement.py b/src/DIRAC/Resources/Computing/SSHComputingElement.py
@@ -597,6 +597,8 @@ def _submitJobToHost(self, executableFile, numberOfJobs, host=None):
             return resultCommand
 
         result = resultCommand["Value"]
+        if not isinstance(result, dict) or "Status" not in result:
+            return S_ERROR("Invalid result from job submission")
         if result["Status"] != 0:
             return S_ERROR(f"Failed job submission: {result['Message']}")
         else:
@@ -639,6 +641,8 @@ def _killJobOnHost(self, jobIDList, host=None):
             return resultCommand
 
         result = resultCommand["Value"]
+        if not isinstance(result, dict) or "Status" not in result:
+            return S_ERROR("Invalid result from job submission")
         if result["Status"] != 0:
             return S_ERROR(f"Failed job kill: {result['Message']}")
 
@@ -674,6 +678,8 @@ def _getHostStatus(self, host=None):
             return resultCommand
 
         result = resultCommand["Value"]
+        if not isinstance(result, dict) or "Status" not in result:
+            return S_ERROR("Invalid result from job submission")
         if result["Status"] != 0:
             return S_ERROR(f"Failed to get CE status: {result['Message']}")
 
@@ -697,6 +703,8 @@ def _getJobStatusOnHost(self, jobIDList, host=None):
                 return resultCommand
 
             result = resultCommand["Value"]
+            if not isinstance(result, dict) or "Status" not in result:
+                return S_ERROR("Invalid result from job submission")
             if result["Status"] != 0:
                 return S_ERROR(f"Failed to get job status: {result['Message']}")
 
@@ -779,6 +787,8 @@ def _getJobOutputFiles(self, jobID):
                 return resultCommand
 
             result = resultCommand["Value"]
+            if not isinstance(result, dict) or "Status" not in result:
+                return S_ERROR("Invalid result from job submission")
             if result["Status"] != 0:
                 return S_ERROR(f"Failed to get job output files: {result['Message']}")