more progress

xjules · Nov 8, 2023 · 4975e67 · 4975e67
1 parent 72929d0
commit 4975e67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/ert/job_queue/job_queue_node.py b/src/ert/job_queue/job_queue_node.py
@@ -208,7 +208,7 @@ def _job_monitor(
         self._handle_end_status(driver, pool_sema, end_status, max_submit)
 
     def _poll_until_done(self, driver: "Driver") -> JobStatus:
-        current_status = self._poll_queue_status(driver)
+        current_status = self.refresh_status(driver)
         backoff = _BackoffFunction()
         # in the following loop, we increase the sleep time between loop iterations as
         # long running realizations do not change state often, and too frequent querying
@@ -231,7 +231,7 @@ def _poll_until_done(self, driver: "Driver") -> JobStatus:
                 self._kill(driver)
                 self._log_kill_thread_stopping_status()
 
-            current_status = self._poll_queue_status(driver)
+            current_status = self.refresh_status(driver)
         self._end_time = time.time()
         return current_status
 
@@ -328,7 +328,8 @@ def _transition_status(
         self.thread_status = thread_status
 
     def _kill(self, driver: "Driver") -> None:
-        _kill(self, driver)
+        # _kill(self, driver)
+        driver.kill(self)
         self._tried_killing += 1
 
     def run(self, driver: "Driver", pool_sema: Semaphore, max_submit: int = 2) -> None:

diff --git a/src/ert/job_queue/queue.py b/src/ert/job_queue/queue.py
@@ -93,6 +93,9 @@ def get_status(self, node: JobQueueNode) -> JobStatus:
     def submit(self, node: JobQueueNode) -> SubmitStatus:
         return SubmitStatus.OK
 
+    def kill(self, node: JobQueueNode) -> None:
+        pass
+
 
 class JobQueue:
     # TYPE_NAME = "job_queue"