added possibility to check for empty drones, closes #92

MatterMiners · Feb 24, 2020 · 0ec40af · 0ec40af
1 parent 89cf6ba
commit 0ec40af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lapis/drone.py b/lapis/drone.py
@@ -21,6 +21,7 @@ def __init__(
         ignore_resources: list = None,
         sitename: str = None,
         connection: Connection = None,
+        empty: callable = lambda drone: False,
     ):
         """
         :param scheduler:
@@ -50,6 +51,10 @@ def __init__(
         self._allocation = None
         self._utilisation = None
         self._job_queue = Queue()
+        self._empty = empty
+
+    def empty(self):
+        return self._empty(self)
 
         # caching-related
         self.jobs_with_cached_data = 0

diff --git a/lapis/scheduler.py b/lapis/scheduler.py
@@ -483,6 +483,8 @@ def cluster_groups(self) -> Iterator[List[Set[WrappedClassAd[Drone]]]]:
         group = []
         current_rank = None
         for ranked_key, drones in self._clusters.items():
+            if next(iter(drones))._wrapped.empty():
+                continue
             if ranked_key.rank != current_rank:
                 current_rank = ranked_key.rank
                 if group: