buildgrid 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

buildgrid/server/s3/s3utils.py

@@ -311,7 +311,7 @@ def _curl_multi_run(
             m.remove_handle(c)
         curl_handles.clear()
 
-    if retry_objects and attempt < S3_MAX_RETRIES:
+    if retry_objects:
         # Wait between attempts with truncated exponential backoff with jitter
         exp_backoff = 2 ** (attempt - 1)
         exp_backoff_with_jitter = random.random() * exp_backoff

buildgrid/server/scheduler/impl.py

@@ -1812,6 +1812,7 @@ class Scheduler:
                     instance_name=instance_name,
                     expiry_time=datetime.utcnow() + timedelta(seconds=self.bot_session_keepalive_timeout),
                     capacity=bot_capacity,
+                    max_capacity=bot_capacity,
                     cohort=bot_cohort,
                 )
             )
@@ -1906,6 +1907,7 @@ class Scheduler:
 
     def _publish_job_duration(
         self,
+        instance_name: str,
         start: Timestamp | None,
         end: Timestamp | None,
         state: str,
@@ -1919,6 +1921,7 @@ class Scheduler:
             publish_timer_metric(
                 METRIC.JOB.DURATION,
                 end.ToDatetime() - start.ToDatetime(),  # type: ignore[union-attr]
+                instanceName=instance_name,
                 state=state,
                 propertyLabel=property_label,
                 schedulerName=assigner_name or "none",
@@ -1964,6 +1967,7 @@ class Scheduler:
                 now_timestamp = Timestamp()
                 now_timestamp.FromDatetime(datetime.utcnow())
                 self._publish_job_duration(
+                    next_job.instance_name,
                     start_timestamp,
                     now_timestamp,
                     "Queued",
@@ -2226,6 +2230,7 @@ class Scheduler:
                 now_timestamp = Timestamp()
                 now_timestamp.FromDatetime(datetime.utcnow())
                 self._publish_job_duration(
+                    job.instance_name,
                     start_timestamp,
                     now_timestamp,
                     "Queued",
@@ -2526,7 +2531,12 @@ class Scheduler:
             )
         )
         self._publish_execution_stats(
-            session, job.name, action_result.execution_metadata, job.property_label, job.assigner_name
+            session,
+            job.name,
+            job.instance_name,
+            action_result.execution_metadata,
+            job.property_label,
+            job.assigner_name,
         )
 
     def get_bot_status_metrics(self) -> BotMetrics:
@@ -2683,17 +2693,21 @@ class Scheduler:
     def publish_execution_stats(
         self,
         job_name: str,
+        instance_name: str,
         execution_metadata: ExecutedActionMetadata,
         property_label: str = "unknown",
         assigner_name: str | None = None,
     ) -> None:
         with self._sql_ro.session(expire_on_commit=False) as session:
-            self._publish_execution_stats(session, job_name, execution_metadata, property_label, assigner_name)
+            self._publish_execution_stats(
+                session, job_name, instance_name, execution_metadata, property_label, assigner_name
+            )
 
     def _publish_execution_stats(
         self,
         session: Session,
         job_name: str,
+        instance_name: str,
         execution_metadata: ExecutedActionMetadata,
         property_label: str,
         assigner_name: str | None,
@@ -2709,12 +2723,18 @@ class Scheduler:
         upload_start = execution_metadata.output_upload_start_timestamp
         upload_completed = execution_metadata.output_upload_completed_timestamp
 
-        self._publish_job_duration(queued, worker_completed, "Total", property_label, assigner_name)
+        self._publish_job_duration(instance_name, queued, worker_completed, "Total", property_label, assigner_name)
         # The Queued time is missing here as it's posted as soon as worker has accepted the job.
-        self._publish_job_duration(worker_start, worker_completed, "Worker", property_label, assigner_name)
-        self._publish_job_duration(fetch_start, fetch_completed, "Fetch", property_label, assigner_name)
-        self._publish_job_duration(execution_start, execution_completed, "Execution", property_label, assigner_name)
-        self._publish_job_duration(upload_start, upload_completed, "Upload", property_label, assigner_name)
+        self._publish_job_duration(
+            instance_name, worker_start, worker_completed, "Worker", property_label, assigner_name
+        )
+        self._publish_job_duration(instance_name, fetch_start, fetch_completed, "Fetch", property_label, assigner_name)
+        self._publish_job_duration(
+            instance_name, execution_start, execution_completed, "Execution", property_label, assigner_name
+        )
+        self._publish_job_duration(
+            instance_name, upload_start, upload_completed, "Upload", property_label, assigner_name
+        )
 
         if self.metering_client is None or len(execution_metadata.auxiliary_metadata) == 0:
             return

buildgrid/server/settings.py

@@ -84,7 +84,7 @@ REQUEST_METADATA_TOOL_NAME = "buildgrid"
 REQUEST_METADATA_TOOL_VERSION = __version__
 
 S3_USERAGENT_NAME = f"{REQUEST_METADATA_TOOL_NAME}/{REQUEST_METADATA_TOOL_VERSION}"
-S3_MAX_RETRIES = 4
+S3_MAX_RETRIES = 5
 S3_MAX_UPLOAD_SIZE = 8 * 1024 * 1024
 S3_TIMEOUT_CONNECT = 120
 S3_TIMEOUT_READ = 120

buildgrid/server/sql/alembic/versions/8f7f43e4a833_add_immutable_jobs_max_capacity_column.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 immutable jobs.max_capacity column
+
+Revision ID: 8f7f43e4a833
+Revises: 85096c931383
+Create Date: 2025-12-09 14:03:01.907296
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "8f7f43e4a833"
+down_revision = "85096c931383"
+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("max_capacity", sa.Integer(), server_default=sa.text("1"), 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("max_capacity")
+
+    # ### end Alembic commands ###

buildgrid/server/sql/models.py

@@ -277,6 +277,7 @@ class BotEntry(Base):
     name: Mapped[str] = mapped_column(primary_key=True)
     bot_id: Mapped[str] = mapped_column(index=True)
     instance_name: Mapped[str] = mapped_column(index=True)
+    max_capacity: Mapped[int] = mapped_column(server_default=text("1"))
 
     # Scheduling state
     bot_status: Mapped[int]

buildgrid/server/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-__version__ = "0.3.1"
+__version__ = "0.3.3"

{buildgrid-0.3.1.dist-info → buildgrid-0.3.3.dist-info}/METADATA

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

{buildgrid-0.3.1.dist-info → buildgrid-0.3.3.dist-info}/RECORD

@@ -205,10 +205,10 @@ buildgrid/server/monitoring.py,sha256=Ic1qKWfvlmcQOXLN3fVq6Ya1Co1lEU_2aHeXXof2Bf
 buildgrid/server/sentry.py,sha256=U5i3x6_zuQlUKoscjDkZCz35TJ-zaNvwlFyjowEEoLk,1471
 buildgrid/server/server.py,sha256=l-UxfEB6IJEEAzXHbXtIklwjiM18tTMPxI3uB7IvzGQ,29438
 buildgrid/server/servicer.py,sha256=oqU9MaSxxHTDmSxobFTo9YmJctaUCklE2Dj-vfYWKkc,6542
-buildgrid/server/settings.py,sha256=Iy4eS9Putr5GroIVqYNeTcRY7gbvq29wgQoMDQgPJtA,5604
+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=n9eZStzsUHVKCm33O5kD4RgMgRgIUVgOkmGO0lowsqw,603
+buildgrid/server/version.py,sha256=ZFnZSeeeNvUxJJyB2m9gdtWL-3UIBuVI7L2U-mwR2NU,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
@@ -326,16 +326,16 @@ buildgrid/server/quota/service.py,sha256=YFV3zedluSCehFF32sBa_AWPWYS8w_bxHHIbGNv
 buildgrid/server/redis/__init__.py,sha256=avyRxG9BSFd76mCHnGYInDDTqyqDn0UlhOuFzAkPQSs,579
 buildgrid/server/redis/provider.py,sha256=oeN69kC0HGLwb-9e2pSOSUleSauUjKkR9NgBbDOfpW4,6270
 buildgrid/server/s3/__init__.py,sha256=zbeeRP9BEeDzR-Mx2Ip6SUr49J8eeXsuREgljJTrHkk,579
-buildgrid/server/s3/s3utils.py,sha256=_LzHob5ni5mvqeCPk4n_TozrQ3PUIaNx6hJfaS7PUfk,21697
+buildgrid/server/s3/s3utils.py,sha256=AcOeUY-KkfwH1ydbulNsxYp3TMmnZj479d9Ceu8TWok,21668
 buildgrid/server/scheduler/__init__.py,sha256=arCg8LWFATeX1tj-s0keVYP8p3wwrrUlCV980bxcSII,1084
 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=jqwf4HU6otf0XLpq0hFUC8JhOgyFKPKYd2-x23biz1M,135712
+buildgrid/server/scheduler/impl.py,sha256=BT5JIdh7B6-pw1OHxnhJjZgQ1sM3T1UxakXoc6ppBxs,136236
 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=jAuNLLvdlBWf7uZWlPLMSC1dTWHYlqlk9Pn5A04rQcg,14374
+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/utils.py,sha256=j76Z_qtGawz6O7vO4-zgCzBV4ylhKszcd_6iY0gV4W4,16470
 buildgrid/server/sql/alembic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
@@ -351,6 +351,7 @@ buildgrid/server/sql/alembic/versions/55fcf6c874d3_remove_request_metadata_from_
 buildgrid/server/sql/alembic/versions/5745d1f0e537_drop_unused_indexes_and_create_.py,sha256=OjQrx8aTNSrwshVDozydcJzJYWmmJLSoGdnSlSMBcGM,2497
 buildgrid/server/sql/alembic/versions/5b90ed0e9d0b_drop_ix_jobs_worker_name_stage.py,sha256=keiHTEhWpor13V4SCW_LqfgEsMn4E8JL_f16JlUhl1U,1585
 buildgrid/server/sql/alembic/versions/85096c931383_drop_ix_jobs_stage_property_label_and_.py,sha256=9r4HEYorA5J4kFarDjdfoJZ-g1HGyEdEIZoVIxlSwAg,1926
+buildgrid/server/sql/alembic/versions/8f7f43e4a833_add_immutable_jobs_max_capacity_column.py,sha256=sUrFN1c4yr82PXeUWaxdJb3nSG_BzXgJH94hLVjVeRw,1446
 buildgrid/server/sql/alembic/versions/8fd7118e215e_add_instanced_job_scheduling_index.py,sha256=U7gmqLlSdl3lsWN2LJYcJHFsIzufvzbHskdmSt5h-Xk,1737
 buildgrid/server/sql/alembic/versions/90bd87d052a0_add_an_audit_table_for_job_state_changes.py,sha256=NrD_D4yjEMQL1cvRZAymxMtU1eyGMkh4OvCsc5y-cXw,1622
 buildgrid/server/sql/alembic/versions/910398062924_add_property_labels_table.py,sha256=2gJlJHMX3zx7uV4bVxCyRXC4ZYsQLdu9nMStWmpx9VM,1755
@@ -365,9 +366,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.3.1.dist-info/licenses/LICENSE,sha256=swa3Vs7GgALaG9p-e05M-WLkhd_U9QknacNkyVZ85xA,11338
-buildgrid-0.3.1.dist-info/METADATA,sha256=_Tt0d76-FzhNXCN5Zm7GNYMl0GgVS3br_ok2uQABmgA,7086
-buildgrid-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-buildgrid-0.3.1.dist-info/entry_points.txt,sha256=uyFAXiR9d6EDfSA5vWT8xskz6xalt4PdTuRruT6Q8rk,49
-buildgrid-0.3.1.dist-info/top_level.txt,sha256=T6TYhI_k6NTm2871tIxGCyBIqzlKxylgF9KDLU0Hi7o,10
-buildgrid-0.3.1.dist-info/RECORD,,
+buildgrid-0.3.3.dist-info/licenses/LICENSE,sha256=swa3Vs7GgALaG9p-e05M-WLkhd_U9QknacNkyVZ85xA,11338
+buildgrid-0.3.3.dist-info/METADATA,sha256=dshu6eNHOz_JPLV3tM3gGitvI9BaGiWpgTWvv2sqjb0,7086
+buildgrid-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+buildgrid-0.3.3.dist-info/entry_points.txt,sha256=uyFAXiR9d6EDfSA5vWT8xskz6xalt4PdTuRruT6Q8rk,49
+buildgrid-0.3.3.dist-info/top_level.txt,sha256=T6TYhI_k6NTm2871tIxGCyBIqzlKxylgF9KDLU0Hi7o,10
+buildgrid-0.3.3.dist-info/RECORD,,