Merge pull request #113 from knopki/fix-110-os-mismatch

OS logic mismatch fix
tilde-lab · Jul 5, 2023 · 639b473 · 639b473
2 parents dc01763 + 30e478f
commit 639b473
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/yascheduler/remote_machine/remote_machine.py b/yascheduler/remote_machine/remote_machine.py
@@ -367,7 +367,7 @@ async def setup_node(self, engines: PEngineRepository):
             conn=conn,
             run=self.run,
             quote=self.quote,
-            engines=engines,
+            engines=engines.filter_platforms(self.platforms),
             engines_dir=self.engines_dir,
             log=self.log,
         )

diff --git a/yascheduler/remote_machine/remote_machine_repository.py b/yascheduler/remote_machine/remote_machine_repository.py
@@ -65,7 +65,7 @@ def filter(
 
         checks: Sequence[Callable[[PRemoteMachine], bool]] = []
         if busy is True:
-            checks.append(lambda x: x.meta.busy)
+            checks.append(lambda x: x.meta.busy is True)
         if busy is False:
             checks.append(lambda x: not x.meta.busy)
         if platforms:

diff --git a/yascheduler/scheduler.py b/yascheduler/scheduler.py
@@ -289,7 +289,8 @@ async def allocate_task(self, task: TaskModel) -> bool:
         "Allocate task to a free remote machine or ask allocation of new cloud machine"
         self.log.debug(f"Allocating task {task.task_id}")
         engine_name: Optional[str] = task.metadata.get("engine", None)
-        if not engine_name or engine_name not in self.config.engines:
+        engine: Optional[Engine] = self.config.engines.get(engine_name)
+        if engine is None:
             self.log.warning(
                 "Unsupported engine '%s' for task_id=%s" % (engine_name, task.task_id)
             )
@@ -298,7 +299,6 @@ async def allocate_task(self, task: TaskModel) -> bool:
             )
             await self.do_task_webhook(task.task_id, task.metadata, TaskStatus.DONE)
             return False
-        engine: Engine = self.config.engines[engine_name]
 
         busy_node_ips = [
             t.ip for t in await self.db.get_tasks_by_status((TaskStatus.RUNNING,))
@@ -518,7 +518,7 @@ async def task_consumer_consumer(
         broken_tasks_passes = 20
         task_id, task = msg.id, msg.payload
         machine = self.remote_machines.get(task.ip)
-        if not machine:
+        if machine is None:
             self.log.warning(f"Task {task_id} - machine {task.ip} is gone")
             machine_not_found.update([task_id])
             if machine_not_found[task_id] > broken_tasks_passes: