Make max_submit parameter function instead

xjules · Dec 13, 2023 · 04defcf · 04defcf
1 parent ecc67a4
commit 04defcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/ert/scheduler/job.py b/src/ert/scheduler/job.py
@@ -66,7 +66,7 @@ def driver(self) -> Driver:
         return self._scheduler.driver
 
     async def __call__(
-        self, start: asyncio.Event, sem: asyncio.BoundedSemaphore
+        self, start: asyncio.Event, sem: asyncio.BoundedSemaphore, max_submit: int = 2
     ) -> None:
         await start.wait()
         retries = 0
@@ -99,18 +99,16 @@ async def __call__(
                 else:
                     await self._send(State.FAILED)
                     retries += 1
-                    retry = retries < self._scheduler._max_submit
+                    retry = retries < max_submit
                     if retry:
                         message = f"Realization: {self.iens} failed, resubmitting"
                         logger.warning(message)
-                        print(message)
                     else:
                         message = (
                             f"Realization: {self.iens} "
                             "failed after reaching max submit "
                             f"{self._scheduler._max_submit}!"
                         )
-                        print(message)
                         logger.error(message)
 
             except asyncio.CancelledError:

diff --git a/src/ert/scheduler/scheduler.py b/src/ert/scheduler/scheduler.py
@@ -45,6 +45,7 @@ def __init__(self, driver: Optional[Driver] = None) -> None:
 
         self._events: Optional[asyncio.Queue[Any]] = None
         self._cancelled = False
+        # will be read from QueueConfig
         self._max_submit: int = 2
 
         self._ee_uri = ""
@@ -125,7 +126,7 @@ async def execute(
         start = asyncio.Event()
         sem = asyncio.BoundedSemaphore(semaphore._initial_value if semaphore else 10)  # type: ignore
         for iens, job in self._jobs.items():
-            self._tasks[iens] = asyncio.create_task(job(start, sem))
+            self._tasks[iens] = asyncio.create_task(job(start, sem, self._max_submit))
 
         start.set()
         for task in self._tasks.values():