buildgrid 0.3.4__py3-none-any.whl → 0.3.5__py3-none-any.whl

buildgrid/server/bots/service.py

@@ -120,16 +120,18 @@ class BaseBotsService:
         orig_leases_count = len(request.bot_session.leases)
         with scheduler.bot_notifier.subscription(request.bot_session.name) as event:
             capacity = get_bot_capacity(request.bot_session)
-            leases = scheduler.synchronize_bot_leases(
+            leases, new_version = scheduler.synchronize_bot_leases(
                 request.bot_session.name,
                 request.bot_session.bot_id,
                 request.bot_session.status,
+                int(request.bot_session.version) if request.bot_session.version else 0,
                 request.bot_session.leases,
                 lease_id_to_partial_execution_metadata,
                 max_capacity=capacity,
             )
             del request.bot_session.leases[:]
             request.bot_session.leases.extend(leases)
+            request.bot_session.version = str(new_version)
 
             LOGGER.debug("Completed initial lease synchronization.", tags=bot_log_tags(request.bot_session))
 
@@ -231,11 +233,18 @@ class BaseBotsService:
 
         # Synchronize the lease again to pick up db changes.
         LOGGER.debug("Synchronizing leases after job assignment wait.", tags=bot_log_tags(bot_session))
-        if leases := scheduler.synchronize_bot_leases(
-            bot_session.name, bot_session.bot_id, bot_session.status, bot_session.leases, max_capacity=capacity
+        if leases_version := scheduler.synchronize_bot_leases(
+            bot_session.name,
+            bot_session.bot_id,
+            bot_session.status,
+            int(bot_session.version) if bot_session.version else 0,
+            bot_session.leases,
+            max_capacity=capacity,
         ):
+            leases, new_version = leases_version
             del bot_session.leases[:]
             bot_session.leases.extend(leases)
+            bot_session.version = str(new_version)
 
 
 class BotsService(BotsServicer, BaseBotsService, InstancedServicer[BotsInterface]):

buildgrid/server/scheduler/impl.py

@@ -918,7 +918,7 @@ class Scheduler:
         update_query = (
             update(BotEntry)
             .where(BotEntry.bot_id == job.worker_name)
-            .values(capacity=BotEntry.capacity + 1)
+            .values(capacity=BotEntry.capacity + 1, version=BotEntry.version + 1)
             .returning(BotEntry.cohort)
         )
         if cohort := session.execute(update_query).scalar_one_or_none():
@@ -1127,6 +1127,7 @@ class Scheduler:
 
         bot.lease_id = job.name
         bot.last_update_timestamp = datetime.utcnow()
+        bot.version += 1
 
         # Reduce the capacity by 1, to prevent overallocation to this specific bot
         bot.capacity -= 1
@@ -1999,10 +2000,11 @@ class Scheduler:
         bot_name: str,
         bot_id: str,
         bot_status: int,
+        bot_version: int,
         bot_session_leases: Sequence[Lease],
         partial_execution_metadata: dict[str, ExecutedActionMetadata] | None = None,
         max_capacity: int = 1,
-    ) -> list[Lease]:
+    ) -> tuple[list[Lease], int]:
         log_tags = {
             "instance_name": try_current_instance(),
             "request.bot_id": bot_id,
@@ -2071,8 +2073,6 @@ class Scheduler:
                     # release locks
                     session.commit()
 
-                # Backwards compatibility: Activate any pending leases for this bot
-                self._activate_bot_pending_leases(bot_id, instance_restricted_bot)
                 # Report completed leases
                 if completed_leases or self.proactive_fetch_to_capacity:
                     active_leases = self._synchronize_completed_leases(
@@ -2080,47 +2080,38 @@ class Scheduler:
                     )
 
             # Synchronize active lease from scheduler
-            return self._synchronize_active_leases(bot_id, instance_restricted_bot, active_leases, log_tags)
+            return self._synchronize_active_leases(
+                bot_name,
+                bot_id,
+                bot_version,
+                instance_restricted_bot,
+                active_leases,
+                log_tags,
+            )
 
         except (BotSessionMismatchError, BotSessionClosedError) as e:
             self.close_bot_sessions(bot_name)
             raise e
 
-    def _activate_bot_pending_leases(self, bot_id: str, instance_restricted_bot: bool) -> None:
-        # Activate any pending leases for a bot that may have been assigned by an old version of scheduler
-        with self._sql.session() as session:
-            pending_leases_stmt = (
-                select(JobEntry)
-                .where(
-                    JobEntry.worker_name == bot_id,
-                    JobEntry.assigned.is_(True),
-                    JobEntry.stage == OperationStage.QUEUED.value,
-                )
-                .with_for_update(skip_locked=True)
-            )
-
-            # If this bot is instance-restricted, only look for jobs in the current instance.
-            if instance_restricted_bot:
-                pending_leases_stmt = pending_leases_stmt.where(self._job_in_instance_pool())
-
-            for job in session.execute(pending_leases_stmt).scalars().all():
-                log_tags = {
-                    "instance_name": job.instance_name,
-                    "request.bot_id": bot_id,
-                    "db.lease_id": job.name,
-                    "db.lease_state": job.lease_state(),
-                    "db.job_stage": job.stage,
-                }
-                LOGGER.info("Activating pending lease for bot.", tags=log_tags)
-                job.stage = OperationStage.EXECUTING.value
-                self._create_logstream_for_job(job, log_tags)
-                self._notify_job_updated(job.name, session)
-
     def _synchronize_active_leases(
-        self, bot_id: str, instance_restricted_bot: bool, active_leases: list[Lease], log_tags: Tags
-    ) -> list[Lease]:
+        self,
+        bot_name: str,
+        bot_id: str,
+        bot_version: int,
+        instance_restricted_bot: bool,
+        active_leases: list[Lease],
+        log_tags: Tags,
+    ) -> tuple[list[Lease], int]:
         synchronized_leases = []
+        new_bot_version = bot_version
         with self._sql.session() as session:
+            if db_bot_version := session.execute(
+                select(BotEntry.version).where(BotEntry.name == bot_name)
+            ).scalar_one_or_none():
+                new_bot_version = db_bot_version
+                if db_bot_version == bot_version:
+                    return active_leases, bot_version
+
             bot_jobs_stmt = select(JobEntry).where(
                 JobEntry.worker_name == bot_id,
                 JobEntry.stage >= OperationStage.QUEUED.value,
@@ -2248,7 +2239,7 @@ class Scheduler:
 
                 synchronized_leases.append(job.to_lease_proto())
 
-        return synchronized_leases
+        return synchronized_leases, new_bot_version
 
     def _synchronize_completed_leases(
         self,
@@ -2305,6 +2296,7 @@ class Scheduler:
 
         # Adjust bot capacity
         bot.capacity += num_synced
+        bot.version += 1
 
         # Determine how many jobs to proactively fetch
         fetch_limit = bot.capacity if self.proactive_fetch_to_capacity else num_synced

buildgrid/server/sql/alembic/versions/ff09fbc30c3e_add_bots_version.py

@@ -0,0 +1,47 @@
+# Copyright (C) 2025 Bloomberg LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  <http://www.apache.org/licenses/LICENSE-2.0>
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Add bots.version
+
+Revision ID: ff09fbc30c3e
+Revises: 8f7f43e4a833
+Create Date: 2025-12-17 13:09:00.326376
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "ff09fbc30c3e"
+down_revision = "8f7f43e4a833"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("bots", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("version", sa.BigInteger(), server_default=sa.text("0"), nullable=False))
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("bots", schema=None) as batch_op:
+        batch_op.drop_column("version")
+
+    # ### end Alembic commands ###

buildgrid/server/sql/models.py

@@ -283,6 +283,7 @@ class BotEntry(Base):
     bot_status: Mapped[int]
     lease_id: Mapped[str | None]
     capacity: Mapped[int] = mapped_column(server_default=text("1"))
+    version: Mapped[int] = mapped_column(BigInteger, server_default=text("0"))
 
     # Auditing data
     expiry_time: Mapped[datetime.datetime] = mapped_column(index=True)

buildgrid/server/sql/provider.py

@@ -407,7 +407,12 @@ class SqlProvider:
                 if transient_dberr:
                     LOGGER.warning("Rolling back database session due to transient database error.", exc_info=True)
                 else:
-                    LOGGER.error("Error committing database session. Rolling back.", exc_info=True)
+                    # Only log full stacktrace if exception is not expected to be suppressed
+                    log_stacktrace = type(e) not in exceptions_to_not_raise_on
+                    if log_stacktrace:
+                        LOGGER.error("Error committing database session. Rolling back.", exc_info=True)
+                    else:
+                        LOGGER.warning(f"Error committing database session. Rolling back: {repr(e)}")
                 if type(e) not in exceptions_to_not_raise_on:
                     if transient_dberr:
                         # Ask the client to retry when the pool is expected to be healthy again

buildgrid/server/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-__version__ = "0.3.4"
+__version__ = "0.3.5"

{buildgrid-0.3.4.dist-info → buildgrid-0.3.5.dist-info}/METADATA

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

{buildgrid-0.3.4.dist-info → buildgrid-0.3.5.dist-info}/RECORD

@@ -208,7 +208,7 @@ buildgrid/server/servicer.py,sha256=oqU9MaSxxHTDmSxobFTo9YmJctaUCklE2Dj-vfYWKkc,
 buildgrid/server/settings.py,sha256=I1UK-g4_GwkX0nGC3hdGS3Cc0Rh1HTYDv2aHU2sq_eU,5604
 buildgrid/server/threading.py,sha256=4QKQYev2KoO2Q-S_OyaoR9qpWyDTVzGMWVe9o2a1yIU,4743
 buildgrid/server/types.py,sha256=xG3bx64pbWMuEwXLuI0o8c2unt2rU2C4zsmUfmMT12c,1323
-buildgrid/server/version.py,sha256=4k5OkV-7Atvya4h3lD2iv9J9jKDYco6vdVsLmuievhM,603
+buildgrid/server/version.py,sha256=4wIbLjmyyGkVkLVxpEA3znizbAYHgaYXJD65B1Mizsw,603
 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
@@ -249,7 +249,7 @@ buildgrid/server/auth/exceptions.py,sha256=z9J0K3GSBAS14HiwWL-nlWLxRKbH2cA0hgYin
 buildgrid/server/auth/manager.py,sha256=MVLyEux60EStFzJdAJX4Q0mEG1bodDVf1973lR3ULvQ,17462
 buildgrid/server/bots/__init__.py,sha256=g9lb8Sn7NY5KOjkMr9GQoJovCVDEg_Fxz_EhdDbhP1I,579
 buildgrid/server/bots/instance.py,sha256=JxJvI4L3z6FkhRsSs6BPs5Q7FJNvtoYZ-ganul8jqTs,1502
-buildgrid/server/bots/service.py,sha256=Gw-fExZq_yLQvrJsnDsDiO-unLMBD2vwLD5PA8UxBnw,14678
+buildgrid/server/bots/service.py,sha256=47uVtXGbo3kW64CLbt42Pq3dqlModzxyUwQ770ikM-s,15063
 buildgrid/server/build_events/__init__.py,sha256=zbeeRP9BEeDzR-Mx2Ip6SUr49J8eeXsuREgljJTrHkk,579
 buildgrid/server/build_events/service.py,sha256=Cg3ky0rXFH0tDOehZ9mmllCBVyOZqvxhIZ8bp8XnCuY,5320
 buildgrid/server/build_events/storage.py,sha256=StGGyx78fr1_Vfum4PJ9IlN0E4Bc2VPX8YiN5hXko44,7261
@@ -331,12 +331,12 @@ 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=BOeR89gJfZ1L9BPzaUoxCUmWqvJGBYauIbphMprrs3U,136516
+buildgrid/server/scheduler/impl.py,sha256=3dgcb63YX_WSAn625dX_kN9i_53UG3Nre6NBGvVEUcw,135605
 buildgrid/server/scheduler/notifier.py,sha256=22ZsKwyf2oQirAjrwROkvgvr4C_TMUNyhOmtro4uM4I,7121
 buildgrid/server/scheduler/properties.py,sha256=2GydX8KUy9MFv1_JznIkGfWE_wOS0m_XapSv6Gp4pCM,11260
 buildgrid/server/sql/__init__.py,sha256=zbeeRP9BEeDzR-Mx2Ip6SUr49J8eeXsuREgljJTrHkk,579
-buildgrid/server/sql/models.py,sha256=EN7zle9sxSZ_nrv-w1ewXLmsTl1x3q-opwtJ2VPA4G4,14446
-buildgrid/server/sql/provider.py,sha256=CXOpjcUY-InwmGnZTpCd4_ziOdROiDY34_SRpqsBwwk,18965
+buildgrid/server/sql/models.py,sha256=mP2h9qgODI12L7sljDBpMWmVAUy0ASq1gj_vQuLJmlA,14525
+buildgrid/server/sql/provider.py,sha256=M7QLy845mcP1dlcMsUU6T8nav5FQ7rKttmJmkctwi0c,19308
 buildgrid/server/sql/utils.py,sha256=j76Z_qtGawz6O7vO4-zgCzBV4ylhKszcd_6iY0gV4W4,16470
 buildgrid/server/sql/alembic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
 buildgrid/server/sql/alembic/env.py,sha256=vRRLEpyPS_a-jeKKYvORE0NW2goBnjN7v62n7ix_t28,4534
@@ -361,14 +361,15 @@ buildgrid/server/sql/alembic/versions/b3b9d7300155_add_capacity_to_bots.py,sha25
 buildgrid/server/sql/alembic/versions/bde0df23383b_add_cohort_to_bots.py,sha256=NPway-yD8G5FMZ4DeWokZItMA2USGSQmGhcYWfY5kwE,1382
 buildgrid/server/sql/alembic/versions/d850621a10d8_add_assigner_name_to_jobs.py,sha256=sT9zO_KYE49P9RE13qe6uLnm06TLO8gV-R3gugXhMJs,1403
 buildgrid/server/sql/alembic/versions/fb8afebee8e6_add_ix_jobs_worker_name_stage.py,sha256=f_5otCQgYNz8h2shTN092LoBbwzoHnAOhvm6mwzgJTc,1757
+buildgrid/server/sql/alembic/versions/ff09fbc30c3e_add_bots_version.py,sha256=2sGvyQC-fLw7iH7P_TZR3E2ZQMSN1CrGDq4dB5JPrBY,1417
 buildgrid/server/utils/__init__.py,sha256=uPwjBaRA6KEakyYf45HeJHCVTdswgylOJ2EDI05Ietc,579
 buildgrid/server/utils/async_lru_cache.py,sha256=iLKeRPoZtZb1wC5AtcyQm8Wt0Bx-KZmPwm8CGSMvF6Y,4471
 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.3.4.dist-info/licenses/LICENSE,sha256=swa3Vs7GgALaG9p-e05M-WLkhd_U9QknacNkyVZ85xA,11338
-buildgrid-0.3.4.dist-info/METADATA,sha256=YkM4cIQyoDCPVLbBqsCh5DdB6shR2WJ1863d2XZUtwQ,7086
-buildgrid-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-buildgrid-0.3.4.dist-info/entry_points.txt,sha256=uyFAXiR9d6EDfSA5vWT8xskz6xalt4PdTuRruT6Q8rk,49
-buildgrid-0.3.4.dist-info/top_level.txt,sha256=T6TYhI_k6NTm2871tIxGCyBIqzlKxylgF9KDLU0Hi7o,10
-buildgrid-0.3.4.dist-info/RECORD,,
+buildgrid-0.3.5.dist-info/licenses/LICENSE,sha256=swa3Vs7GgALaG9p-e05M-WLkhd_U9QknacNkyVZ85xA,11338
+buildgrid-0.3.5.dist-info/METADATA,sha256=V5tbqR84w2PChBoHKlR2KyB79elBEVB9-OY4zmcqqA4,7086
+buildgrid-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+buildgrid-0.3.5.dist-info/entry_points.txt,sha256=uyFAXiR9d6EDfSA5vWT8xskz6xalt4PdTuRruT6Q8rk,49
+buildgrid-0.3.5.dist-info/top_level.txt,sha256=T6TYhI_k6NTm2871tIxGCyBIqzlKxylgF9KDLU0Hi7o,10
+buildgrid-0.3.5.dist-info/RECORD,,