Throw CalledProcessError -> STATE_QUEUE_ERROR on bad return values

rwth-i6 · Aug 19, 2024 · 4bd112f · 4bd112f
1 parent 0631454
commit 4bd112f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/sisyphus/aws_batch_engine.py b/sisyphus/aws_batch_engine.py
@@ -222,7 +222,10 @@ def task_state(self, task, task_id):
         """Return task state:"""
         name = task.task_name()
         task_name = escape_name(name, task_id)
-        queue_state = self.queue_state()
+        try:
+            queue_state = self.queue_state()
+        except subprocess.CalledProcessError:
+            return STATE_QUEUE_ERROR
         qs = queue_state.get(task_name)
 
         # task name should be uniq

diff --git a/sisyphus/load_sharing_facility_engine.py b/sisyphus/load_sharing_facility_engine.py
@@ -255,9 +255,7 @@ def queue_state(self):
             try:
                 out, err, retval = self.system_call(system_command)
                 if retval != 0:
-                    logging.warning(self._system_call_error_warn_msg(system_command))
-                    time.sleep(gs.WAIT_PERIOD_QSTAT_PARSING)
-                    continue
+                    raise subprocess.CalledProcessError(self._system_call_error_warn_msg(system_command))
             except subprocess.TimeoutExpired:
                 logging.warning(self._system_call_timeout_warn_msg(system_command))
                 time.sleep(gs.WAIT_PERIOD_SSH_TIMEOUT)
@@ -292,7 +290,10 @@ def task_state(self, task, task_id):
         name = task.task_name()
         name = escape_name(name).encode()
         task_name = (name, task_id)
-        queue_state = self.queue_state()
+        try:
+            queue_state = self.queue_state()
+        except subprocess.CalledProcessError:
+            return STATE_QUEUE_ERROR
         qs = queue_state[task_name]
 
         # task name should be uniq

diff --git a/sisyphus/simple_linux_utility_for_resource_management_engine.py b/sisyphus/simple_linux_utility_for_resource_management_engine.py
@@ -313,9 +313,7 @@ def queue_state(self):
             try:
                 out, err, retval = self.system_call(system_command)
                 if retval != 0:
-                    logging.warning(self._system_call_error_warn_msg(system_command))
-                    time.sleep(gs.WAIT_PERIOD_QSTAT_PARSING)
-                    continue
+                    raise subprocess.CalledProcessError(self._system_call_error_warn_msg(system_command))
             except subprocess.TimeoutExpired:
                 logging.warning(self._system_call_timeout_warn_msg(system_command))
                 time.sleep(gs.WAIT_PERIOD_SSH_TIMEOUT)
@@ -350,7 +348,10 @@ def task_state(self, task, task_id):
         name = task.task_name()
         name = self.process_task_name(name)
         task_name = (name, task_id)
-        queue_state = self.queue_state()
+        try:
+            queue_state = self.queue_state()
+        except subprocess.CalledProcessError:
+            return STATE_QUEUE_ERROR
         qs = queue_state[task_name]
 
         # task name should be uniq

diff --git a/sisyphus/son_of_grid_engine.py b/sisyphus/son_of_grid_engine.py
@@ -324,9 +324,7 @@ def queue_state(self):
             try:
                 out, err, retval = self.system_call(system_command)
                 if retval != 0:
-                    logging.warning(self._system_call_error_warn_msg(system_command))
-                    time.sleep(gs.WAIT_PERIOD_QSTAT_PARSING)
-                    continue
+                    raise subprocess.CalledProcessError(self._system_call_error_warn_msg(system_command))
             except subprocess.TimeoutExpired:
                 logging.warning(self._system_call_timeout_warn_msg(system_command))
                 time.sleep(gs.WAIT_PERIOD_SSH_TIMEOUT)
@@ -416,7 +414,10 @@ def task_state(self, task, task_id):
         name = task.task_name()
         name = escape_name(name)
         task_name = (name, task_id)
-        queue_state = self.queue_state()
+        try:
+            queue_state = self.queue_state()
+        except subprocess.CalledProcessError:
+            return STATE_QUEUE_ERROR
         qs = queue_state[task_name]
 
         # task name should be uniq