Make connection_validator and connection_expiration extensions correct handle shared_timed_queue connection pool (Fixes #2354)

jeremyevans · jeremyevans · commit 3caf120f1b8f · 2026-02-25T08:34:07.000-08:00
Previously, these extensions did not handle the shared_timed_queue
connection pool when disconnecting connections. The
sharded_timed_queue needs extra care due to it's management of the
pool size.  Add a disconnect_acquired_connection private method
to the connection pool designed for use by these extensions, and
call that. Override the method in shared_timed_queue to correctly
decrement the size.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 === master
 
+* Make connection_validator and connection_expiration extensions correct handle shared_timed_queue connection pool (jeremyevans) (#2354)
+
 * Add connection_checkout_event_callback extension to assist in collecting telemetry information (jeremyevans)
 
 === 5.101.0 (2026-02-01)
diff --git a/lib/sequel/connection_pool.rb b/lib/sequel/connection_pool.rb
@@ -131,6 +131,12 @@ def disconnect_connection(conn)
     db.disconnect_connection(conn)
   end
 
+  # Only for use by extension that need to disconnect a connection inside acquire.
+  # Takes the connection and any arguments accepted by acquire.
+  def disconnect_acquired_connection(conn, *)
+    disconnect_connection(conn)
+  end
+
   # Whether the given exception is a disconnect exception.
   def disconnect_error?(exception)
     exception.is_a?(Sequel::DatabaseDisconnectError) || db.send(:disconnect_error?, exception, OPTS)
diff --git a/lib/sequel/connection_pool/sharded_timed_queue.rb b/lib/sequel/connection_pool/sharded_timed_queue.rb
@@ -225,6 +225,12 @@ def disconnect_connections(conns)
     conns.each{|conn| disconnect_connection(conn)}
   end
 
+  # Only for use by extension that need to disconnect a connection inside acquire.
+  # Takes the connection and any arguments accepted by acquire.
+  def disconnect_acquired_connection(conn, _, server)
+    disconnect_pool_connection(conn, server)
+  end
+
   # Decrement the current size of the pool for the server when disconnecting connections.
   #
   # Calling code should not have the mutex when calling this.
diff --git a/lib/sequel/extensions/connection_expiration.rb b/lib/sequel/extensions/connection_expiration.rb
@@ -91,7 +91,7 @@ def acquire(*a)
             sync{@allocated.delete(Sequel.current)}
           end
 
-          disconnect_connection(conn)
+          disconnect_acquired_connection(conn, *a)
           redo
         end
       end
diff --git a/lib/sequel/extensions/connection_validator.rb b/lib/sequel/extensions/connection_validator.rb
@@ -118,7 +118,7 @@ def acquire(*a)
                 sync{@allocated.delete(Sequel.current)}
               end
 
-              disconnect_connection(conn)
+              disconnect_acquired_connection(conn, *a)
               redo if valid == false
             end
           end
diff --git a/spec/extensions/connection_expiration_spec.rb b/spec/extensions/connection_expiration_spec.rb
@@ -47,6 +47,7 @@ def disconnect_connection(conn)
     c2 = @db.synchronize{|c| c}
     @db.sqls.must_equal ['disconnect']
     c2.wont_be_same_as(c1)
+    @db.pool.size.must_equal 1
   end
 
   it "should disconnect only expired connections among multiple" do
diff --git a/spec/extensions/connection_validator_spec.rb b/spec/extensions/connection_validator_spec.rb
@@ -53,6 +53,7 @@ def connect(server)
     c2 = @db.synchronize{|c| c}
     @db.sqls.must_equal ['SELECT NULL', 'disconnect']
     c2.wont_be_same_as(c1)
+    @db.pool.size.must_equal 1
   end
 
   it "should assume that exceptions raised during valid_connection mean the connection is not valid" do
