Skip to content

πŸ™Œ OpenHands: AI-Driven Development

fix: share GCS storage.Client() across requests to prevent connection pool exhaustion (#14269)

Graham Neubigcb9d297773e7
diff --git a/enterprise/server/sharing/google_cloud_shared_event_service.py b/enterprise/server/sharing/google_cloud_shared_event_service.py
index 91870f8e42..0b580ed356 100644
--- a/enterprise/server/sharing/google_cloud_shared_event_service.py
+++ b/enterprise/server/sharing/google_cloud_shared_event_service.py
@@ -17,9 +17,7 @@ from typing import AsyncGenerator
from uuid import UUID
from fastapi import Request
-from google.cloud import storage
from google.cloud.storage.bucket import Bucket
-from google.cloud.storage.client import Client
from pydantic import Field
from server.sharing.shared_conversation_info_service import (
SharedConversationInfoService,
@@ -36,6 +34,7 @@ from openhands.agent_server.models import EventPage, EventSortOrder
from openhands.app_server.event.event_service import EventService
from openhands.app_server.event.google_cloud_event_service import (
GoogleCloudEventService,
+ _get_shared_storage_client,
)
from openhands.app_server.event_callback.event_callback_models import EventKind
from openhands.app_server.services.injector import InjectorState
@@ -148,8 +147,7 @@ class GoogleCloudSharedEventServiceInjector(SharedEventServiceInjector):
)
bucket_name = self.bucket_name
- storage_client: Client = storage.Client()
- bucket: Bucket = storage_client.bucket(bucket_name)
+ bucket: Bucket = _get_shared_storage_client().bucket(bucket_name)
service = GoogleCloudSharedEventService(
shared_conversation_info_service=shared_conversation_info_service,
diff --git a/enterprise/tests/unit/test_sharing/test_sharing_shared_event_service.py b/enterprise/tests/unit/test_sharing/test_sharing_shared_event_service.py
index a2633bf374..b50b4fb67f 100644
--- a/enterprise/tests/unit/test_sharing/test_sharing_shared_event_service.py
+++ b/enterprise/tests/unit/test_sharing/test_sharing_shared_event_service.py
@@ -450,14 +450,14 @@ class TestGoogleCloudSharedEventServiceInjector:
mock_db_context.__aenter__.return_value = mock_db_session
mock_db_context.__aexit__.return_value = None
- # Mock storage.Client and bucket
+ # Mock shared storage client and bucket
mock_storage_client = MagicMock()
mock_bucket = MagicMock()
mock_storage_client.bucket.return_value = mock_bucket
with (
patch(
- 'server.sharing.google_cloud_shared_event_service.storage.Client',
+ 'server.sharing.google_cloud_shared_event_service._get_shared_storage_client',
return_value=mock_storage_client,
),
patch(
@@ -489,14 +489,14 @@ class TestGoogleCloudSharedEventServiceInjector:
mock_db_context.__aenter__.return_value = mock_db_session
mock_db_context.__aexit__.return_value = None
- # Mock storage.Client and bucket
+ # Mock shared storage client and bucket
mock_storage_client = MagicMock()
mock_bucket = MagicMock()
mock_storage_client.bucket.return_value = mock_bucket
with (
patch(
- 'server.sharing.google_cloud_shared_event_service.storage.Client',
+ 'server.sharing.google_cloud_shared_event_service._get_shared_storage_client',
return_value=mock_storage_client,
),
patch(
@@ -526,14 +526,14 @@ class TestGoogleCloudSharedEventServiceInjector:
mock_db_context.__aenter__.return_value = mock_db_session
mock_db_context.__aexit__.return_value = None
- # Mock storage.Client and bucket
+ # Mock shared storage client and bucket
mock_storage_client = MagicMock()
mock_bucket = MagicMock()
mock_storage_client.bucket.return_value = mock_bucket
with (
patch(
- 'server.sharing.google_cloud_shared_event_service.storage.Client',
+ 'server.sharing.google_cloud_shared_event_service._get_shared_storage_client',
return_value=mock_storage_client,
),
patch(
@@ -569,13 +569,13 @@ class TestGoogleCloudSharedEventServiceInjector:
mock_db_context.__aenter__.return_value = mock_db_session
mock_db_context.__aexit__.return_value = None
- # Mock storage.Client and bucket
+ # Mock shared storage client and bucket
mock_storage_client = MagicMock()
mock_bucket = MagicMock()
mock_storage_client.bucket.return_value = mock_bucket
with patch(
- 'server.sharing.google_cloud_shared_event_service.storage.Client',
+ 'server.sharing.google_cloud_shared_event_service._get_shared_storage_client',
return_value=mock_storage_client,
):
with patch(
diff --git a/openhands/app_server/event/google_cloud_event_service.py b/openhands/app_server/event/google_cloud_event_service.py
index f51f39af00..93a2b4e1ed 100644
--- a/openhands/app_server/event/google_cloud_event_service.py
+++ b/openhands/app_server/event/google_cloud_event_service.py
@@ -3,6 +3,7 @@
import json
import logging
from dataclasses import dataclass
+from functools import lru_cache
from pathlib import Path
from typing import AsyncGenerator, Iterator
@@ -22,6 +23,17 @@ from openhands.sdk import Event
_logger = logging.getLogger(__name__)
+@lru_cache(maxsize=1)
+def _get_shared_storage_client() -> Client:
+ """Return a process-wide shared GCS client.
+
+ google.cloud.storage.Client is thread-safe and manages its own urllib3
+ connection pool. Creating one per request leads to pool exhaustion under
+ load ("Connection pool is full, discarding connection").
+ """
+ return storage.Client()
+
+
@dataclass
class GoogleCloudEventService(EventServiceBase):
"""Google Cloud Storage-based implementation of EventService."""
@@ -78,8 +90,7 @@ class GoogleCloudEventServiceInjector(EventServiceInjector):
user_id = await user_context.get_user_id()
bucket_name = self.bucket_name
- storage_client: Client = storage.Client()
- bucket: Bucket = storage_client.bucket(bucket_name)
+ bucket: Bucket = _get_shared_storage_client().bucket(bucket_name)
yield GoogleCloudEventService(
prefix=self.prefix,