Use STATE_RUNNABLE instead of STATE_QUEUE_ERROR

rwth-i6 · Aug 19, 2024 · ccd7756 · ccd7756
1 parent 0d5ea83
commit ccd7756
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/sisyphus/aws_batch_engine.py b/sisyphus/aws_batch_engine.py
@@ -26,7 +26,7 @@
 
 import sisyphus.global_settings as gs
 from sisyphus.engine import EngineBase
-from sisyphus.global_settings import STATE_RUNNING, STATE_UNKNOWN, STATE_QUEUE, STATE_QUEUE_ERROR
+from sisyphus.global_settings import STATE_RUNNABLE, STATE_RUNNING, STATE_UNKNOWN, STATE_QUEUE, STATE_QUEUE_ERROR
 
 ENGINE_NAME = "aws"
 TaskInfo = namedtuple("TaskInfo", ["job_id", "task_id", "state"])
@@ -225,7 +225,7 @@ def task_state(self, task, task_id):
         try:
             queue_state = self.queue_state()
         except subprocess.CalledProcessError:
-            return STATE_QUEUE_ERROR
+            return STATE_RUNNABLE
         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
@@ -11,7 +11,7 @@
 
 import sisyphus.global_settings as gs
 from sisyphus.engine import EngineBase
-from sisyphus.global_settings import STATE_RUNNING, STATE_UNKNOWN, STATE_QUEUE, STATE_QUEUE_ERROR
+from sisyphus.global_settings import STATE_RUNNABLE, STATE_RUNNING, STATE_UNKNOWN, STATE_QUEUE, STATE_QUEUE_ERROR
 
 ENGINE_NAME = "lsf"
 TaskInfo = namedtuple("TaskInfo", ["job_id", "task_id", "state"])
@@ -295,7 +295,7 @@ def task_state(self, task, task_id):
         try:
             queue_state = self.queue_state()
         except subprocess.CalledProcessError:
-            return STATE_QUEUE_ERROR
+            return STATE_RUNNABLE
         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
@@ -13,7 +13,7 @@
 
 import sisyphus.global_settings as gs
 from sisyphus.engine import EngineBase
-from sisyphus.global_settings import STATE_RUNNING, STATE_UNKNOWN, STATE_QUEUE, STATE_QUEUE_ERROR
+from sisyphus.global_settings import STATE_RUNNABLE, STATE_RUNNING, STATE_UNKNOWN, STATE_QUEUE, STATE_QUEUE_ERROR
 
 ENGINE_NAME = "slurm"
 TaskInfo = namedtuple("TaskInfo", ["job_id", "task_id", "state"])
@@ -353,7 +353,7 @@ def task_state(self, task, task_id):
         try:
             queue_state = self.queue_state()
         except subprocess.CalledProcessError:
-            return STATE_QUEUE_ERROR
+            return STATE_RUNNABLE
         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
@@ -15,7 +15,7 @@
 
 import sisyphus.global_settings as gs
 from sisyphus.engine import EngineBase
-from sisyphus.global_settings import STATE_RUNNING, STATE_UNKNOWN, STATE_QUEUE, STATE_QUEUE_ERROR
+from sisyphus.global_settings import STATE_RUNNABLE, STATE_RUNNING, STATE_UNKNOWN, STATE_QUEUE, STATE_QUEUE_ERROR
 
 ENGINE_NAME = "sge"
 TaskInfo = namedtuple("TaskInfo", ["job_id", "task_id", "state"])
@@ -419,7 +419,7 @@ def task_state(self, task, task_id):
         try:
             queue_state = self.queue_state()
         except subprocess.CalledProcessError:
-            return STATE_QUEUE_ERROR
+            return STATE_RUNNABLE
         qs = queue_state[task_name]
 
         # task name should be uniq