π OpenHands: AI-Driven Development
fix(app-server): lower DB pool defaults and make them env-tunable (#15270)
dylan5adf4dac2d9b
diff --git a/openhands/app_server/services/db_session_injector.py b/openhands/app_server/services/db_session_injector.pyindex b954d5cc65..a6ce22f043 100644--- a/openhands/app_server/services/db_session_injector.py+++ b/openhands/app_server/services/db_session_injector.py@@ -34,7 +34,8 @@ class DbSessionInjector(BaseModel, Injector[AsyncSession]):user: str | None = Nonepassword: SecretStr | None = Noneecho: bool = False- pool_size: int = 25+ # Defaults follow SQLAlchemy's own pool_size=5, max_overflow=10)+ pool_size: int = 5max_overflow: int = 10pool_recycle: int = 1800pool_use_lifo: bool = True@@ -71,6 +72,12 @@ class DbSessionInjector(BaseModel, Injector[AsyncSession]):self.gcp_region = os.getenv('GCP_REGION')if self.ssl_mode is None:self.ssl_mode = os.getenv('DB_SSL_MODE') or os.getenv('PGSSLMODE')+ pool_size = os.getenv('DB_POOL_SIZE')+ if pool_size:+ self.pool_size = int(pool_size)+ max_overflow = os.getenv('DB_MAX_OVERFLOW')+ if max_overflow:+ self.max_overflow = int(max_overflow)return selfdef _create_gcp_db_connection(self):diff --git a/tests/unit/app_server/test_db_session_injector.py b/tests/unit/app_server/test_db_session_injector.pyindex b552a4fe60..fddab1e76f 100644--- a/tests/unit/app_server/test_db_session_injector.py+++ b/tests/unit/app_server/test_db_session_injector.py@@ -103,7 +103,7 @@ class TestDbSessionInjectorConfiguration:service.password.get_secret_value() == 'postgres') # Default from env var processingassert service.echo is False- assert service.pool_size == 25+ assert service.pool_size == 5assert service.max_overflow == 10assert service.pool_use_lifo is Trueassert service.gcp_db_instance is None@@ -138,6 +138,14 @@ class TestDbSessionInjectorConfiguration:assert service.gcp_region == 'env_region'assert service.ssl_mode == 'require'+ def test_pool_size_env_vars_override_defaults(self, temp_persistence_dir):+ """DB_POOL_SIZE / DB_MAX_OVERFLOW override the model defaults."""+ with patch.dict(os.environ, {'DB_POOL_SIZE': '30', 'DB_MAX_OVERFLOW': '7'}):+ service = DbSessionInjector(persistence_dir=temp_persistence_dir)++ assert service.pool_size == 30+ assert service.max_overflow == 7+def test_explicit_values_override_env_vars(self, temp_persistence_dir):"""Test that explicitly provided values override environment variables."""env_vars = {@@ -213,7 +221,7 @@ class TestDbSessionInjectorConnections:# Verify other parametersassert call_args[1]['connect_args'] == {}- assert call_args[1]['pool_size'] == 25+ assert call_args[1]['pool_size'] == 5assert call_args[1]['max_overflow'] == 10assert call_args[1]['pool_pre_ping']assert call_args[1]['pool_use_lifo'] is True@@ -247,7 +255,7 @@ class TestDbSessionInjectorConnections:# Verify other parametersassert call_args[1]['connect_args'] == {}- assert call_args[1]['pool_size'] == 25+ assert call_args[1]['pool_size'] == 5assert call_args[1]['max_overflow'] == 10assert call_args[1]['pool_pre_ping']assert call_args[1]['pool_use_lifo'] is True