progress

Author: psteinroe

crates/pgt_workspace/src/workspace/server/connection_manager.rs

@@ -39,15 +39,14 @@ impl ConnectionManager {
             return None;
         }
 
-        // Try read lock first for cache hit
-        if let Ok(pools) = self.pools.read() {
-            if let Some(cached_pool) = pools.get(&key) {
-                // Can't update last_accessed with read lock, but that's okay for occasional misses
-                return Some(cached_pool.pool.clone());
+        {
+            if let Ok(pools) = self.pools.read() {
+                if let Some(cached_pool) = pools.get(&key) {
+                    return Some(cached_pool.pool.clone());
+                }
             }
         }
 
-        // Cache miss or need to update timestamp - use write lock
         let mut pools = self.pools.write().unwrap();
 
         // Double-check after acquiring write lock
@@ -57,7 +56,19 @@ impl ConnectionManager {
         }
 
         // Clean up idle connections before creating new ones to avoid unbounded growth
-        self.cleanup_idle_pools_with_lock(&mut pools, &key);
+        let now = Instant::now();
+        pools.retain(|k, cached_pool| {
+            let idle_duration = now.duration_since(cached_pool.last_accessed);
+            if idle_duration > cached_pool.idle_timeout && k != &key {
+                tracing::debug!(
+                    "Removing idle database connection (idle for {:?})",
+                    idle_duration
+                );
+                false
+            } else {
+                true
+            }
+        });
 
         // Create a new pool
         let config = PgConnectOptions::new()
@@ -85,28 +96,4 @@ impl ConnectionManager {
 
         Some(pool)
     }
-
-    /// Remove pools that haven't been accessed for longer than the idle timeout
-    /// This version works with an existing write lock to avoid deadlocks
-    fn cleanup_idle_pools_with_lock(
-        &self,
-        pools: &mut HashMap<ConnectionKey, CachedPool>,
-        ignore_key: &ConnectionKey,
-    ) {
-        let now = Instant::now();
-
-        // Use retain to keep only non-idle connections
-        pools.retain(|key, cached_pool| {
-            let idle_duration = now.duration_since(cached_pool.last_accessed);
-            if idle_duration > cached_pool.idle_timeout && key != ignore_key {
-                tracing::debug!(
-                    "Removing idle database connection (idle for {:?})",
-                    idle_duration
-                );
-                false
-            } else {
-                true
-            }
-        });
-    }
 }