Secure, Fast, and Extensible Sandbox runtime for AI agents.
fix(server): keep Docker create validation off the event loop
Maohaode23173681f0
diff --git a/server/opensandbox_server/services/docker/docker_service.py b/server/opensandbox_server/services/docker/docker_service.pyindex 96bb37f87..c63d2cffa 100644--- a/server/opensandbox_server/services/docker/docker_service.py+++ b/server/opensandbox_server/services/docker/docker_service.py@@ -620,7 +620,8 @@ class DockerSandboxService(DockerDiagnosticsMixin, DockerRuntimeMixin, DockerVolself._ensure_secure_access_support(request)self._ensure_network_policy_support(request)resource_limits = self._prepare_resource_limits(request)- self._validate_network_exists()+ # Docker API calls block; keep them off the event loop.+ await asyncio.to_thread(self._validate_network_exists)try:sandbox_env, egress_env = split_egress_env(request.env)@@ -634,12 +635,16 @@ class DockerSandboxService(DockerDiagnosticsMixin, DockerRuntimeMixin, DockerVol) from esandbox_id, created_at, expires_at = self._prepare_creation_context(request)- pvc_inspect_cache, auto_created_volumes = self._validate_volumes(request)loop = asyncio.get_running_loop()future: asyncio.Future[CreateSandboxResponse] = loop.create_future()def _run() -> None:+ auto_created_volumes: list[str] = []try:+ # Volume validation calls the Docker API and may create+ # volumes, so it runs here, off the event loop, where a failed+ # create removes them below.+ pvc_inspect_cache, auto_created_volumes = self._validate_volumes(request)result = self._provision_sandbox(sandbox_id, request, created_at, expires_at, resource_limits,pvc_inspect_cache, auto_created_volumes,diff --git a/server/tests/test_docker_service.py b/server/tests/test_docker_service.pyindex 92a97affd..e9a607879 100644--- a/server/tests/test_docker_service.py+++ b/server/tests/test_docker_service.py@@ -15,6 +15,7 @@import asyncioimport jsonimport os+import threadingfrom datetime import datetime, timedelta, timezonefrom typing import Any, castfrom unittest.mock import MagicMock, patch@@ -2671,6 +2672,40 @@ async def test_create_sandbox_response_includes_extensions(mock_docker):assert response.extensions == {"opensandbox.extensions.test-key": "test-value"}+@patch("opensandbox_server.services.docker.docker_service.docker")+async def test_create_sandbox_runs_docker_validation_off_the_event_loop(mock_docker):+ """Network and volume validation call the Docker API, which can block for+ a long time; it must not run on the event loop thread."""+ mock_client = MagicMock()+ mock_client.containers.list.return_value = []+ mock_docker.from_env.return_value = mock_client++ service = DockerSandboxService(config=_app_config())+ request = CreateSandboxRequest(+ image=ImageSpec(uri="python:3.11"),+ resourceLimits=ResourceLimits(root={}),+ env={},+ entrypoint=["python"],+ )+ loop_thread = threading.get_ident()+ validation_threads: list[int] = []++ def record_thread(*_args):+ validation_threads.append(threading.get_ident())+ return {}, []++ with (+ patch.object(service, "_validate_network_exists", side_effect=record_thread),+ patch.object(service, "_validate_volumes", side_effect=record_thread),+ patch.object(service, "_create_and_start_container", return_value=MagicMock()),+ ):+ await service.create_sandbox(request)++ assert len(validation_threads) == 2+ assert loop_thread not in validation_threads++def test_build_labels_store_platform_constraints():service = DockerSandboxService(config=_app_config())request = CreateSandboxRequest(