buildgrid 0.3.1__tar.gz → 0.3.3__tar.gz

{buildgrid-0.3.1 → buildgrid-0.3.3}/PKG-INFO

@@ -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 → buildgrid-0.3.3}/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-0.3.1 → buildgrid-0.3.3}/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-0.3.1 → buildgrid-0.3.3}/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-0.3.3/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-0.3.1 → buildgrid-0.3.3}/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-0.3.1 → buildgrid-0.3.3}/buildgrid/server/version.py

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

{buildgrid-0.3.1 → buildgrid-0.3.3}/buildgrid.egg-info/PKG-INFO

@@ -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 → buildgrid-0.3.3}/buildgrid.egg-info/SOURCES.txt

@@ -365,6 +365,7 @@ buildgrid/server/sql/alembic/versions/55fcf6c874d3_remove_request_metadata_from_
 buildgrid/server/sql/alembic/versions/5745d1f0e537_drop_unused_indexes_and_create_.py
 buildgrid/server/sql/alembic/versions/5b90ed0e9d0b_drop_ix_jobs_worker_name_stage.py
 buildgrid/server/sql/alembic/versions/85096c931383_drop_ix_jobs_stage_property_label_and_.py
+buildgrid/server/sql/alembic/versions/8f7f43e4a833_add_immutable_jobs_max_capacity_column.py
 buildgrid/server/sql/alembic/versions/8fd7118e215e_add_instanced_job_scheduling_index.py
 buildgrid/server/sql/alembic/versions/90bd87d052a0_add_an_audit_table_for_job_state_changes.py
 buildgrid/server/sql/alembic/versions/910398062924_add_property_labels_table.py

{buildgrid-0.3.1 → buildgrid-0.3.3}/pyproject.toml

@@ -21,7 +21,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "buildgrid"
-version = "0.3.1"
+version = "0.3.3"
 requires-python = ">=3.11"
 description = "A remote execution service"
 readme = "README.rst"

{buildgrid-0.3.1 → buildgrid-0.3.3}/tests/test_scheduler.py

@@ -882,7 +882,7 @@ def test_publish_execution_stats(controller, mock_metering_client, mock_executio
     scheduler.metering_client = mock_metering_client
 
     with instance_context("sql"):
-        scheduler.publish_execution_stats("job", mock_execution_metadata, "linux")
+        scheduler.publish_execution_stats("job", "", mock_execution_metadata, "linux")
     assert len(mock_metering_client.sink) == 2
 
 
@@ -892,7 +892,7 @@ def test_publish_execution_stats_fetch_fails_no_throw(controller, mock_metering_
     mock_metering_client.put_usage.side_effect = MeteringServiceHTTPError(503, "big bang")
 
     with instance_context("sql"):
-        scheduler.publish_execution_stats("job", mock_execution_metadata)
+        scheduler.publish_execution_stats("job", "", mock_execution_metadata)
     assert len(mock_metering_client.sink) == 0
 
 
@@ -907,7 +907,7 @@ def test_publish_execution_stats_invalid_execution_stats(controller, mock_meteri
     mock_execution_metadata.auxiliary_metadata.append(some_digest_any)
 
     with instance_context("sql"):
-        scheduler.publish_execution_stats("job", mock_execution_metadata, "linux")
+        scheduler.publish_execution_stats("job", "", mock_execution_metadata, "linux")
     assert len(mock_metering_client.sink) == 0
 
 
@@ -916,7 +916,7 @@ def test_publish_execution_stats_no_client(controller, mock_metering_client, moc
     # Just dont assign a client?? Weird test
 
     with instance_context("sql"):
-        scheduler.publish_execution_stats("job", mock_execution_metadata, "linux")
+        scheduler.publish_execution_stats("job", "", mock_execution_metadata, "linux")
     assert len(mock_metering_client.sink) == 0