make it work on the active queries

geldata · Feb 12, 2024 · 1204ead · 1204ead
1 parent 03c17e2
commit 1204ead
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/edb/server/tenant.py b/edb/server/tenant.py
@@ -744,9 +744,6 @@ async def ensure_database_not_connected(
 
         self._block_new_connections.add(dbname)
 
-        # Prune our inactive connections.
-        await self._pg_pool.prune_inactive_connections(dbname)
-
         # Signal adjacent servers to prune their connections to this
         # database.
         await self.signal_sysevent(
@@ -760,6 +757,10 @@ async def ensure_database_not_connected(
 
         async for iteration in rloop:
             async with iteration:
+                # Prune our inactive connections.  (Do it in the loop
+                # to help in the close_frontend_conns situation.)
+                await self._pg_pool.prune_inactive_connections(dbname)
+
                 await self._pg_ensure_database_not_connected(dbname)
 
     async def _pg_ensure_database_not_connected(self, dbname: str) -> None: