buildgrid 0.2.49__tar.gz → 0.2.51__tar.gz

{buildgrid-0.2.49 → buildgrid-0.2.51}/PKG-INFO

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

{buildgrid-0.2.49 → buildgrid-0.2.51}/buildgrid/server/auth/manager.py

@@ -98,10 +98,18 @@ def _is_localhost_request(context: grpc.ServicerContext) -> bool:
     if peer_info.startswith("ipv6:[::1]:"):
         return True
 
+    # Handle URL-encoded IPv6 localhost (e.g., "ipv6:%5B::1%5D:12345")
+    if peer_info.startswith("ipv6:%5B::1%5D:"):
+        return True
+
     # Handle IPv4-mapped IPv6 localhost (e.g., "ipv6:[::ffff:127.0.0.1]:12345")
     if peer_info.startswith("ipv6:[::ffff:127.0.0.1]:"):
         return True
 
+    # Handle URL-encoded IPv4-mapped IPv6 localhost (e.g., "ipv6:%5B::ffff:127.0.0.1%5D:12345")
+    if peer_info.startswith("ipv6:%5B::ffff:127.0.0.1%5D:"):
+        return True
+
     # Handle Unix domain sockets (e.g., "unix:/tmp/socket")
     if peer_info.startswith("unix:"):
         return True

{buildgrid-0.2.49 → buildgrid-0.2.51}/buildgrid/server/scheduler/impl.py

@@ -1822,11 +1822,7 @@ class Scheduler:
             # it are requeued and the existing record deleted. A new record is then
             # created with the new bot_id/name combination, as it would in the
             # unknown case.
-            locate_bot_stmt = (
-                select(BotEntry)
-                .where(BotEntry.bot_id == bot_session_id, self._bot_in_instance_pool())
-                .with_for_update()
-            )
+            locate_bot_stmt = select(BotEntry).where(BotEntry.bot_id == bot_session_id).with_for_update()
             self._close_bot_sessions(session, session.execute(locate_bot_stmt).scalars().all())
 
             session.add(
@@ -1866,9 +1862,7 @@ class Scheduler:
 
     def close_bot_sessions(self, bot_name: str) -> None:
         with self._sql.session() as session:
-            locate_bot_stmt = (
-                select(BotEntry).where(BotEntry.name == bot_name, self._bot_in_instance_pool()).with_for_update()
-            )
+            locate_bot_stmt = select(BotEntry).where(BotEntry.name == bot_name).with_for_update()
             self._close_bot_sessions(session, session.execute(locate_bot_stmt).scalars().all())
 
     def _close_bot_sessions(self, session: Session, bots: Sequence[BotEntry]) -> None:

{buildgrid-0.2.49 → buildgrid-0.2.51}/buildgrid/server/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-__version__ = "0.2.49"
+__version__ = "0.2.51"

{buildgrid-0.2.49 → buildgrid-0.2.51}/buildgrid.egg-info/PKG-INFO

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

{buildgrid-0.2.49 → buildgrid-0.2.51}/pyproject.toml

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

{buildgrid-0.2.49 → buildgrid-0.2.51}/tests/test_scheduler.py

@@ -1092,6 +1092,39 @@ def test_wildcard_bot_retries_jobs(controller):
             assert not job.assigned
 
 
+def test_wildcard_bot_deletes_old_sessions(controller):
+    scheduler: Scheduler = controller.execution_instance.scheduler
+    bot_id = "test-worker"
+
+    # Connect a bot
+    with instance_context("instance-a"):
+        scheduler.add_bot_entry(
+            bot_name=f"*/{uuid.uuid4()}",
+            bot_session_id=bot_id,
+            bot_session_status=BotStatus.OK.value,
+            instance_name="instance-a",
+        )
+
+    # Reconnect a bot with the same session ID
+    with instance_context("*"):
+        scheduler.add_bot_entry(
+            bot_name=f"*/{uuid.uuid4()}",
+            bot_session_id=bot_id,
+            bot_session_status=BotStatus.OK.value,
+            instance_name="*",
+        )
+
+    # There should only be a single bot with the given ID, and it should be the one using the
+    # wildcard instance name.
+    with scheduler._sql.session() as session:
+        stmt = select(BotEntry).where(BotEntry.bot_id == bot_id)
+        bots = session.execute(stmt).scalars().all()
+        assert len(bots) == 1
+
+        bot = bots[0]
+        assert bot.instance_name == "*"
+
+
 def test_max_queue_size(controller_max_queue_size):
     scheduler = controller_max_queue_size.execution_instance.scheduler