π OpenHands: AI-Driven Development
fix: Enable LIFO database connection pooling (#15225)
Tim O'Farrelld1563c95260d
diff --git a/enterprise/migrations/env.py b/enterprise/migrations/env.pyindex d2e2e54a8c..0ce1554820 100644--- a/enterprise/migrations/env.py+++ b/enterprise/migrations/env.py@@ -62,6 +62,7 @@ def get_engine(database_name=DB_NAME):pool_size=POOL_SIZE,max_overflow=MAX_OVERFLOW,pool_pre_ping=True,+ pool_use_lifo=True,)else:scheme = f'postgresql+{DB_DRIVER}' if DB_DRIVER else 'postgresql'@@ -73,6 +74,7 @@ def get_engine(database_name=DB_NAME):pool_size=POOL_SIZE,max_overflow=MAX_OVERFLOW,pool_pre_ping=True,+ pool_use_lifo=True,connect_args=(build_pg8000_connect_args(DB_SSL_MODE) if DB_DRIVER == 'pg8000' else {}),diff --git a/openhands/app_server/services/db_session_injector.py b/openhands/app_server/services/db_session_injector.pyindex 5351200d8f..b954d5cc65 100644--- a/openhands/app_server/services/db_session_injector.py+++ b/openhands/app_server/services/db_session_injector.py@@ -37,6 +37,7 @@ class DbSessionInjector(BaseModel, Injector[AsyncSession]):pool_size: int = 25max_overflow: int = 10pool_recycle: int = 1800+ pool_use_lifo: bool = Truegcp_db_instance: str | None = Nonegcp_project: str | None = Nonegcp_region: str | None = None@@ -125,6 +126,7 @@ class DbSessionInjector(BaseModel, Injector[AsyncSession]):pool_size=self.pool_size,max_overflow=self.max_overflow,pool_pre_ping=True,+ pool_use_lifo=self.pool_use_lifo,)return engine@@ -162,6 +164,7 @@ class DbSessionInjector(BaseModel, Injector[AsyncSession]):max_overflow=self.max_overflow,pool_pre_ping=True,pool_recycle=self.pool_recycle,+ pool_use_lifo=self.pool_use_lifo,)async def get_async_db_engine(self) -> AsyncEngine:@@ -199,6 +202,7 @@ class DbSessionInjector(BaseModel, Injector[AsyncSession]):max_overflow=self.max_overflow,pool_recycle=self.pool_recycle,pool_pre_ping=True,+ pool_use_lifo=self.pool_use_lifo,)else:async_engine = create_async_engine(@@ -243,6 +247,7 @@ class DbSessionInjector(BaseModel, Injector[AsyncSession]):max_overflow=self.max_overflow,pool_recycle=self.pool_recycle,pool_pre_ping=True,+ pool_use_lifo=self.pool_use_lifo,)assert engine is not None # Always assigned in either branch aboveself._engine = enginediff --git a/tests/unit/app_server/test_db_session_injector.py b/tests/unit/app_server/test_db_session_injector.pyindex bddd88df4d..b552a4fe60 100644--- a/tests/unit/app_server/test_db_session_injector.py+++ b/tests/unit/app_server/test_db_session_injector.py@@ -105,6 +105,7 @@ class TestDbSessionInjectorConfiguration:assert service.echo is Falseassert service.pool_size == 25assert service.max_overflow == 10+ assert service.pool_use_lifo is Trueassert service.gcp_db_instance is Noneassert service.gcp_project is Noneassert service.gcp_region is None@@ -215,6 +216,7 @@ class TestDbSessionInjectorConnections:assert call_args[1]['pool_size'] == 25assert call_args[1]['max_overflow'] == 10assert call_args[1]['pool_pre_ping']+ assert call_args[1]['pool_use_lifo'] is True@pytest.mark.asyncioasync def test_postgres_async_connection_with_host(@@ -248,6 +250,7 @@ class TestDbSessionInjectorConnections:assert call_args[1]['pool_size'] == 25assert call_args[1]['max_overflow'] == 10assert call_args[1]['pool_pre_ping']+ assert call_args[1]['pool_use_lifo'] is Truedef test_postgres_connection_requires_ssl(self, temp_persistence_dir):service = DbSessionInjector(