buildgrid 0.2.52__py3-none-any.whl → 0.2.53__py3-none-any.whl

buildgrid/server/scheduler/impl.py

@@ -1949,7 +1949,9 @@ class Scheduler:
             )
 
     @timed(METRIC.SCHEDULER.ASSIGNMENT_DURATION)
-    def _fetch_job_for_bot(self, session: Session, bot: BotEntry, log_tags: Tags) -> JobEntry | None:
+    def _fetch_job_for_bot(
+        self, session: Session, bot: BotEntry, usage_diffs: InstanceQuotaUsageDiffs, log_tags: Tags
+    ) -> JobEntry | None:
         # Attempt to fetch a new job for a bot to work on.
         # This can help if there are usually more jobs available than bots.
 
@@ -1959,15 +1961,22 @@ class Scheduler:
             if bot.instance_name != "*":
                 job_statement = job_statement.where(self._job_in_instance_pool())
 
-            # Prioritize instance where usage <= max_quota - bot.capacity
-            # `- bot.capacity` to avoid over-assigning jobs to bots when nearing quota limits
-            instances_query = select(InstanceQuota.instance_name).where(
-                InstanceQuota.bot_cohort == bot.cohort,
-                InstanceQuota.current_usage <= InstanceQuota.max_quota - bot.capacity,
-            )
-            instances = session.execute(instances_query).scalars().all()
-            if instances:
-                job_statement = job_statement.where(JobEntry.instance_name.in_(instances))
+            if bot.cohort:
+                # Prioritize instance where usage <= max_quota - bot.capacity
+                # `- bot.capacity` to avoid over-assigning jobs to bots when nearing quota limits
+                instances_query = select(InstanceQuota.instance_name).where(
+                    InstanceQuota.bot_cohort == bot.cohort,
+                    InstanceQuota.current_usage <= InstanceQuota.max_quota - bot.capacity,
+                )
+                instances: set[str] = set()
+                instances.update(session.execute(instances_query).scalars().all())
+                # Always allow scheduling more jobs of an instance if we're returning usage
+                instances.update(
+                    {instance for (cohort, instance), diff in usage_diffs.items() if cohort == bot.cohort and diff < 0}
+                )
+
+                if instances:
+                    job_statement = job_statement.where(JobEntry.instance_name.in_(instances))
 
             if next_job := session.execute(job_statement).scalar_one_or_none():
                 log_tags["db.next_job_name"] = next_job.name
@@ -2321,7 +2330,7 @@ class Scheduler:
 
         for _ in range(fetch_limit):
             # Try to fill up the newly free capacity with new jobs.
-            if new_job := self._fetch_job_for_bot(session, bot, log_tags):
+            if new_job := self._fetch_job_for_bot(session, bot, usage_diffs, log_tags):
                 if bot.cohort:
                     usage_diffs[(bot.cohort, new_job.instance_name)] += 1
                 synchronized_leases.append(new_job.to_lease_proto())

buildgrid/server/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-__version__ = "0.2.52"
+__version__ = "0.2.53"

{buildgrid-0.2.52.dist-info → buildgrid-0.2.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildgrid
-Version: 0.2.52
+Version: 0.2.53
 Summary: A remote execution service
 License: Apache License, Version 2.0
 Project-URL: Homepage, https://buildgrid.build

{buildgrid-0.2.52.dist-info → buildgrid-0.2.53.dist-info}/RECORD

@@ -208,7 +208,7 @@ buildgrid/server/servicer.py,sha256=oqU9MaSxxHTDmSxobFTo9YmJctaUCklE2Dj-vfYWKkc,
 buildgrid/server/settings.py,sha256=Iy4eS9Putr5GroIVqYNeTcRY7gbvq29wgQoMDQgPJtA,5604
 buildgrid/server/threading.py,sha256=4QKQYev2KoO2Q-S_OyaoR9qpWyDTVzGMWVe9o2a1yIU,4743
 buildgrid/server/types.py,sha256=xG3bx64pbWMuEwXLuI0o8c2unt2rU2C4zsmUfmMT12c,1323
-buildgrid/server/version.py,sha256=n2RBFSFcPdtiRMdJG5gZUeScD96hl-zdswg8rwRhQmU,604
+buildgrid/server/version.py,sha256=zv7pfyNMnfQiih7uFjY-_UFi2yhATpDRA43o8Nz28fo,604
 buildgrid/server/actioncache/__init__.py,sha256=g9lb8Sn7NY5KOjkMr9GQoJovCVDEg_Fxz_EhdDbhP1I,579
 buildgrid/server/actioncache/instance.py,sha256=UCR7ZGkv4fJOXjeIILMAdTSFWcGgBSYlBg8fMaPJpaI,3139
 buildgrid/server/actioncache/service.py,sha256=WcikJAzFYOYX-tgiOfGGcOnPoubrCd4yP-EhKCHEW0c,2021
@@ -334,7 +334,7 @@ buildgrid/server/scheduler/__init__.py,sha256=arCg8LWFATeX1tj-s0keVYP8p3wwrrUlCV
 buildgrid/server/scheduler/assigner.py,sha256=wHPAhyiQxYABZJXaUc2g5yFzM78Z0U5nvGV3X9h5pCM,10512
 buildgrid/server/scheduler/cohorts.py,sha256=L_5YZRiVOwPPGStfqnnQXknO5Ja-SC0vq0xjw4XgP-I,1426
 buildgrid/server/scheduler/events.py,sha256=cM7Z7Htr2pYKhltJxfg1YRo0q524yZaGm8yXvRehivk,1453
-buildgrid/server/scheduler/impl.py,sha256=q8U92yEbdFqzOYNrIGn9d4J8bCBCCIGPy4ZGg5YpOvM,137141
+buildgrid/server/scheduler/impl.py,sha256=MR3Hp0hxuYTpFu0hnriin2GcY1xgri_HAok4EaeToow,137584
 buildgrid/server/scheduler/notifier.py,sha256=uypoIXZowpAIsDQ728VCuFJ4MN2zJld1npnanCWHTrw,8854
 buildgrid/server/scheduler/properties.py,sha256=2GydX8KUy9MFv1_JznIkGfWE_wOS0m_XapSv6Gp4pCM,11260
 buildgrid/server/sql/__init__.py,sha256=zbeeRP9BEeDzR-Mx2Ip6SUr49J8eeXsuREgljJTrHkk,579
@@ -368,9 +368,9 @@ buildgrid/server/utils/async_lru_cache.py,sha256=iLKeRPoZtZb1wC5AtcyQm8Wt0Bx-KZm
 buildgrid/server/utils/bots.py,sha256=c8hn7tbCecru-m2wicRmtKU5v5rSZPGlk97Yc6eUHgQ,1729
 buildgrid/server/utils/cancellation.py,sha256=pNETzKNoXg0AsXOXKCcLWlFl7SVKdkKinlqWl7MesRA,1703
 buildgrid/server/utils/digests.py,sha256=YNrWeHdbNp7OVTcsInjs30C33z_t9GQ_noMd14bpqPQ,2424
-buildgrid-0.2.52.dist-info/licenses/LICENSE,sha256=swa3Vs7GgALaG9p-e05M-WLkhd_U9QknacNkyVZ85xA,11338
-buildgrid-0.2.52.dist-info/METADATA,sha256=w-UPonoGIo3xi-h7rqGWp-4focQ-2iax4Q6H18iXIEs,7040
-buildgrid-0.2.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-buildgrid-0.2.52.dist-info/entry_points.txt,sha256=uyFAXiR9d6EDfSA5vWT8xskz6xalt4PdTuRruT6Q8rk,49
-buildgrid-0.2.52.dist-info/top_level.txt,sha256=T6TYhI_k6NTm2871tIxGCyBIqzlKxylgF9KDLU0Hi7o,10
-buildgrid-0.2.52.dist-info/RECORD,,
+buildgrid-0.2.53.dist-info/licenses/LICENSE,sha256=swa3Vs7GgALaG9p-e05M-WLkhd_U9QknacNkyVZ85xA,11338
+buildgrid-0.2.53.dist-info/METADATA,sha256=U9a7b52eyU6pWfE8PIMYE-Rl4TvhbC9d_Po0MEHnXG4,7040
+buildgrid-0.2.53.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+buildgrid-0.2.53.dist-info/entry_points.txt,sha256=uyFAXiR9d6EDfSA5vWT8xskz6xalt4PdTuRruT6Q8rk,49
+buildgrid-0.2.53.dist-info/top_level.txt,sha256=T6TYhI_k6NTm2871tIxGCyBIqzlKxylgF9KDLU0Hi7o,10
+buildgrid-0.2.53.dist-info/RECORD,,