Scheduler uses classad functionality for matchmaking and scheduling

lapis/drone.py

@@ -15,6 +15,7 @@ def __init__(
         pool_resources: dict,
         scheduling_duration: float,
         ignore_resources: list = None,
+        empty: callable = lambda drone: False,
     ):
         """
         :param scheduler:
@@ -41,6 +42,10 @@ def __init__(
         self._allocation = None
         self._utilisation = None
         self._job_queue = Queue()
+        self._empty = empty
+
+    def empty(self):
+        return self._empty(self)
 
     @property
     def theoretical_available_resources(self):
@@ -143,7 +148,6 @@ async def _run_job(self, job: Job, kill: bool):
                             except KeyError:
                                 # check is not relevant if the data is not stored
                                 pass
-                    self.scheduler.update_drone(self)
                     await job_execution.done
             except ResourcesUnavailable:
                 await instant

lapis/job.py

@@ -24,6 +24,7 @@ class Job(object):
         "_name",
         "drone",
         "_success",
+        "__weakref__",
     )
 
     def __init__(
@@ -83,7 +84,7 @@ def successful(self) -> Optional[bool]:
     def waiting_time(self) -> float:
         """
         The time the job spent in the simulators scheduling queue. `Inf` when
-        the job is still waitiing.
+        the job is still waiting.
 
         :return: Time in queue
         """

lapis/monitor/general.py

@@ -89,9 +89,8 @@ def job_statistics(scheduler: CondorJobScheduler) -> List[Dict]:
     :return: list of records for logging
     """
     result = 0
-    for cluster in scheduler.drone_cluster.copy():
-        for drone in cluster:
-            result += drone.jobs
+    for drone in scheduler.drone_list:
+        result += drone.jobs
     return [
         {
             "pool_configuration": "None",