Merge pull request rails#54711 from byroot/ensure-configured-connection

Disconnect if `configure_connection` failed

Author: byroot

activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -677,7 +677,7 @@ def reconnect!(restore_transactions: false)
 
           reset_transaction(restore: restore_transactions) do
             clear_cache!(new_connection: true)
-            configure_connection
+            attempt_configure_connection
           end
         rescue => original_exception
           translated_exception = translate_exception_class(original_exception, nil, nil)
@@ -730,7 +730,7 @@ def discard!
       def reset!
         clear_cache!(new_connection: true)
         reset_transaction
-        configure_connection
+        attempt_configure_connection
       end
 
       # Removes the connection from the pool and disconnect it.
@@ -766,7 +766,7 @@ def verify!
             if @unconfigured_connection
               @raw_connection = @unconfigured_connection
               @unconfigured_connection = nil
-              configure_connection
+              attempt_configure_connection
               @last_activity = Process.clock_gettime(Process::CLOCK_MONOTONIC)
               @verified = true
               return
@@ -1219,6 +1219,13 @@ def configure_connection
           check_version
         end
 
+        def attempt_configure_connection
+          configure_connection
+        rescue
+          disconnect!
+          raise
+        end
+
         def default_prepared_statements
           true
         end

activerecord/test/cases/adapter_test.rb

@@ -873,6 +873,27 @@ def teardown
         @connection.execute("SELECT 1", allow_retry: true)
       end
 
+      test "disconnect and recover on #configure_connection failure" do
+        connection = ActiveRecord::Base.connection_pool.send(:new_connection)
+
+        failures = [ActiveRecord::ConnectionFailed.new("Oops"), ActiveRecord::ConnectionFailed.new("Oops 2")]
+        connection.singleton_class.define_method(:configure_connection) do
+          if error = failures.pop
+            raise error
+          else
+            super()
+          end
+        end
+        assert_raises ActiveRecord::ConnectionFailed do
+          connection.exec_query("SELECT 1")
+        end
+
+        assert_equal [[1]], connection.exec_query("SELECT 1").rows
+        assert_empty failures
+      ensure
+        connection&.disconnect!
+      end
+
       private
         def raw_transaction_open?(connection)
           case connection.adapter_name