buildgrid 0.3.0__tar.gz → 0.3.1__tar.gz

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

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

{buildgrid-0.3.0 → buildgrid-0.3.1}/buildgrid/server/app/settings/parser.py

@@ -1025,7 +1025,7 @@ def load_sql_scheduler(
         sql_ro = sql_ro or sql
         sql_notifier = sql_notifier or sql
 
-        logstream_url, logstream_credentials, logstream_instance = get_logstream_connection_info(logstream)
+        logstream_url, logstream_credentials = get_logstream_connection_info(logstream)
         logstream_channel: grpc.Channel | None = None
         if logstream_url is not None:
             logstream_credentials = logstream_credentials or {}
@@ -1081,7 +1081,6 @@ def load_sql_scheduler(
             ),
             bot_session_keepalive_timeout=bot_session_keepalive_timeout,
             logstream_channel=logstream_channel,
-            logstream_instance=logstream_instance,
             asset_client=asset_client,
             queued_action_retention_hours=queued_action_retention_hours,
             completed_action_retention_hours=completed_action_retention_hours,
@@ -2150,7 +2149,6 @@ def load_metering_service_client(
 def load_asset_client(
     url: str,
     credentials: ClientCredentials | None = None,
-    instance_name: str = "",
     request_timeout: float = 5.0,
     retries: int = 3,
 ) -> AssetClient:
@@ -2162,7 +2160,6 @@ def load_asset_client(
 
             - !asset-client
               url: https://remote-asset.com
-              instance-name: dev
               credentials:
                 tls-client-cert: /path/to/cert
                 auth-token: /path/to/token
@@ -2179,7 +2176,7 @@ def load_asset_client(
         server_cert=credentials.get("tls-server-cert"),
         timeout=request_timeout,
     )
-    return AssetClient(channel=channel, instance_name=instance_name, retries=retries)
+    return AssetClient(channel=channel, retries=retries)
 
 
 @object_tag("!introspection")
@@ -2378,18 +2375,16 @@ def _validate_server_credentials(credentials: dict[str, str] | None) -> None:
         sys.exit(-1)
 
 
-def get_logstream_connection_info(logstream: Any) -> tuple[str | None, dict[str, str] | None, str | None]:
+def get_logstream_connection_info(logstream: Any) -> tuple[str | None, dict[str, str] | None]:
     logstream_url = None
     credentials = None
-    logstream_instance_name = None
     if logstream:
         logstream_url = logstream["url"]
         credentials = logstream.get("credentials")
         if not _validate_url_and_credentials(logstream_url, credentials=credentials):
             sys.exit(-1)
-        logstream_instance_name = logstream.get("instance-name", "")
 
-    return logstream_url, credentials, logstream_instance_name
+    return logstream_url, credentials
 
 
 def get_schema(strict: bool = False) -> Any:

{buildgrid-0.3.0 → buildgrid-0.3.1}/buildgrid/server/app/settings/schema.yml

@@ -472,7 +472,7 @@ definitions:
       priority-assignment-percentage:   { type: number, minimum: 0 }
       metering-service-client:          { "$ref": "#/definitions/metering-service-client" }
       metering-throttle-action:         { type: string, enum: [deprioritize, reject] }
-      logstream:                        { "$ref": "#/definitions/grpc-connection-options" }
+      logstream:                        { "$ref": "#/definitions/logstream-connection-options" }
       asset-client:                     { "$ref": "#/definitions/asset-client" }
       action-browser-url:               { type: string }
       poll-interval:                    { type: number, minimum: 0 }
@@ -645,12 +645,11 @@ definitions:
     properties:
       kind:            { type: string, enum: [ "!asset-client" ] }
       url:             { type: string }
-      instance-name:   { type: string }
       channel-options: { type: object, propertyNames: { pattern: "^[a-z0-9-]+$" } }
       request-timeout: { type: number }
       credentials:     { "$ref": "#/definitions/grpc-credentials" }
       retries:         { type: number }
-    required: [kind, url, instance-name]
+    required: [kind, url]
 
   metering-service-client:
     type: object
@@ -783,16 +782,15 @@ definitions:
       retry-limit:               { type: integer, min: 0 }
     required: [instance-name, index, high-watermark, low-watermark, batch-size]
 
-  grpc-connection-options:
+  logstream-connection-options:
     type: object
     propertyNames: { pattern: "^[A-Za-z0-9-]*$" }
     properties:
       url:              { type: string }
-      instance-name:    { type: string }
       channel-options:  { type: object, propertyNames: { pattern: "^[a-z0-9-]+$" } }
       request-timeout:  { type: number }
       credentials:      { "$ref": "#/definitions/grpc-credentials" }
-    required: [url, instance-name]
+    required: [url]
 
   grpc-credentials:
     type: object

{buildgrid-0.3.0 → buildgrid-0.3.1}/buildgrid/server/client/asset.py

@@ -41,13 +41,11 @@ class AssetClient:
     def __init__(
         self,
         channel: grpc.Channel,
-        instance_name: str,
         retries: int = 0,
         max_backoff: int = 64,
         should_backoff: bool = True,
     ) -> None:
         self._channel = channel
-        self._instance_name = instance_name
         self._push_stub = PushStub(channel)
         self._fetch_stub = FetchStub(channel)
         self._retrier = GrpcRetrier(retries=retries, max_backoff=max_backoff, should_backoff=should_backoff)
@@ -68,6 +66,7 @@ class AssetClient:
         expire_at: datetime | None = None,
         referenced_blobs: Iterable[Digest] = [],
         referenced_directories: Iterable[Digest] = [],
+        instance_name: str,
     ) -> PushBlobResponse:
         def _push_blob() -> PushBlobResponse:
             qualifiers_pb = [Qualifier(name=name, value=value) for name, value in qualifiers.items()]
@@ -77,7 +76,7 @@ class AssetClient:
                 expire_at_pb.FromDatetime(expire_at)
 
             request = PushBlobRequest(
-                instance_name=self._instance_name,
+                instance_name=instance_name,
                 uris=uris,
                 qualifiers=qualifiers_pb,
                 expire_at=expire_at_pb,
@@ -98,6 +97,7 @@ class AssetClient:
         expire_at: datetime | None = None,
         referenced_blobs: Iterable[Digest] = [],
         referenced_directories: Iterable[Digest] = [],
+        instance_name: str,
     ) -> PushDirectoryResponse:
         def _push_directory() -> PushDirectoryResponse:
             qualifiers_pb = [Qualifier(name=name, value=value) for name, value in qualifiers.items()]
@@ -107,7 +107,7 @@ class AssetClient:
                 expire_at_pb.FromDatetime(expire_at)
 
             request = PushDirectoryRequest(
-                instance_name=self._instance_name,
+                instance_name=instance_name,
                 uris=uris,
                 qualifiers=qualifiers_pb,
                 expire_at=expire_at_pb,

{buildgrid-0.3.0 → buildgrid-0.3.1}/buildgrid/server/scheduler/impl.py

@@ -218,7 +218,6 @@ class Scheduler:
         metering_throttle_action: MeteringThrottleAction | None = None,
         bot_session_keepalive_timeout: int = 600,
         logstream_channel: Channel | None = None,
-        logstream_instance: str | None = None,
         asset_client: AssetClient | None = None,
         queued_action_retention_hours: float | None = None,
         completed_action_retention_hours: float | None = None,
@@ -268,7 +267,6 @@ class Scheduler:
         self.metering_throttle_action = metering_throttle_action or MeteringThrottleAction.DEPRIORITIZE
         self.bot_session_keepalive_timeout = bot_session_keepalive_timeout
         self.logstream_channel = logstream_channel
-        self.logstream_instance = logstream_instance
         self.asset_client = asset_client
         self.queued_action_retention_hours = queued_action_retention_hours
         self.completed_action_retention_hours = completed_action_retention_hours
@@ -414,7 +412,9 @@ class Scheduler:
                 LOGGER.exception("Checking ActionCache for action failed.", tags=dict(digest=action_digest))
 
         # Extend retention for action
-        self._update_action_retention(action, action_digest, self.queued_action_retention_hours)
+        self._update_action_retention(
+            action, action_digest, self.queued_action_retention_hours, instance_name=current_instance()
+        )
 
         return self.create_operation_for_new_job(
             action=action,
@@ -1975,11 +1975,11 @@ class Scheduler:
         return None
 
     def _create_logstream_for_job(self, job: JobEntry, log_tags: Tags) -> None:
-        if self.logstream_channel and self.logstream_instance is not None:
+        if self.logstream_channel:
             try:
                 action_digest = string_to_digest(job.action_digest)
                 parent_base = f"{action_digest.hash}_{action_digest.size_bytes}_{int(time())}"
-                with logstream_client(self.logstream_channel, self.logstream_instance) as ls_client:
+                with logstream_client(self.logstream_channel, job.instance_name) as ls_client:
                     stdout_stream = ls_client.create(f"{parent_base}_stdout")
                     stderr_stream = ls_client.create(f"{parent_base}_stderr")
                 job.stdout_stream_name = stdout_stream.name
@@ -2503,9 +2503,12 @@ class Scheduler:
             Action.FromString(job.action),
             string_to_digest(job.action_digest),
             retention_hours=self.completed_action_retention_hours,
+            instance_name=job.instance_name,
         )
         if action_result.ByteSize() > 0:
-            self._update_action_result_retention(action_result, retention_hours=self.action_result_retention_hours)
+            self._update_action_result_retention(
+                action_result, retention_hours=self.action_result_retention_hours, instance_name=job.instance_name
+            )
 
         worker_duration = None
         if job.worker_start_timestamp is not None and job.worker_completed_timestamp is not None:
@@ -2749,7 +2752,9 @@ class Scheduler:
         except Exception as exc:
             LOGGER.exception("Cannot publish resource usage.", tags=dict(job_name=job_name), exc_info=exc)
 
-    def _update_action_retention(self, action: Action, action_digest: Digest, retention_hours: float | None) -> None:
+    def _update_action_retention(
+        self, action: Action, action_digest: Digest, retention_hours: float | None, instance_name: str
+    ) -> None:
         if not self.asset_client or not retention_hours:
             return
         uri = DIGEST_URI_TEMPLATE.format(digest_hash=action_digest.hash)
@@ -2766,6 +2771,7 @@ class Scheduler:
                 expire_at=expire_at,
                 referenced_blobs=referenced_blobs,
                 referenced_directories=referenced_directories,
+                instance_name=instance_name,
             )
             LOGGER.debug(
                 "Extended the retention of action.", tags=dict(digest=action_digest, retention_hours=retention_hours)
@@ -2774,7 +2780,9 @@ class Scheduler:
             LOGGER.exception("Failed to push action as an asset.", tags=dict(digest=action_digest))
             # Not a fatal path, don't reraise here
 
-    def _update_action_result_retention(self, action_result: ActionResult, retention_hours: float | None) -> None:
+    def _update_action_result_retention(
+        self, action_result: ActionResult, retention_hours: float | None, instance_name: str
+    ) -> None:
         if not self.asset_client or not retention_hours:
             return
         digest = None
@@ -2813,6 +2821,7 @@ class Scheduler:
                 expire_at=expire_at,
                 referenced_blobs=referenced_blobs,
                 referenced_directories=referenced_directories,
+                instance_name=instance_name,
             )
             LOGGER.debug(
                 "Extended the retention of action result.", tags=dict(digest=digest, retention_hours=retention_hours)

{buildgrid-0.3.0 → buildgrid-0.3.1}/buildgrid/server/version.py

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

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

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

{buildgrid-0.3.0 → buildgrid-0.3.1}/data/config/bots-interface.yml

@@ -41,7 +41,6 @@ schedulers:
     action-cache: *build-cache
     logstream:
       url: http://logstream:50055
-      instance-name: ''
 
 instances:
   - name: ''

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

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

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

@@ -123,7 +123,7 @@ def asset_service_channel(asset_service_remote: str) -> Iterator[grpc.Channel]:
 
 @pytest.fixture
 def asset_client(push_service, asset_service_channel: grpc.Channel) -> Iterator[AssetClient]:
-    yield AssetClient(asset_service_channel, instance_name="asset")
+    yield AssetClient(asset_service_channel)
 
 
 @pytest.fixture
@@ -378,7 +378,7 @@ def test_update_lease_state(controller, push_service: MockAssetPushServicer):
         # check retention for queued action
         assert job.action_digest in push_service.blobs
         asset = push_service.blobs[job.action_digest]
-        assert asset.instance_name == "asset"
+        assert asset.instance_name == "sql"
         assert asset.uris == [f"nih:sha-256;{string_to_digest(job.action_digest).hash}"]
         action = Action.FromString(job.action)
         assert action.command_digest in asset.references_blobs
@@ -407,7 +407,7 @@ def test_update_lease_state(controller, push_service: MockAssetPushServicer):
         action_result = scheduler.storage.get_message(string_to_digest(job.result), ExecuteResponse).result
         result_digest = create_digest(action_result.SerializeToString())
         result_asset = push_service.blobs[digest_to_string(result_digest)]
-        assert result_asset.instance_name == "asset"
+        assert result_asset.instance_name == "sql"
         assert result_asset.uris == [f"nih:sha-256;{result_digest.hash}"]
         assert mock_stderr_digest in result_asset.references_blobs
         assert result_asset.expire_at.ToDatetime() > datetime.datetime.now() + datetime.timedelta(hours=2)
@@ -567,7 +567,6 @@ def test_action_deduplication(controller):
 def test_get_metadata_for_leases(controller):
     scheduler = controller.execution_instance.scheduler
     scheduler.logstream_channel = mock.MagicMock()
-    scheduler.logstream_instance = "testing"
 
     with mock.patch("buildgrid.server.scheduler.impl.logstream_client", new=mock_logstream_client()):
         bot_name, bot_id, operation_name, _ = mock_queue_job_action(scheduler)