Merge pull request rsim#2523 from yahonda/translate-lost-connection-to-connection-failed

Translate lost-connection errors to ActiveRecord::ConnectionFailed

Author: yahonda

lib/active_record/connection_adapters/oracle_enhanced/connection.rb

@@ -118,6 +118,14 @@ def _select_value(arel, name = nil, binds = [])
       def database_version
         raise NoMethodError, "Not implemented for this raw driver"
       end
+
+      # ORA-00028 your session has been killed
+      # ORA-01012 not logged on
+      # ORA-03113 end-of-file on communication channel
+      # ORA-03114 not connected to ORACLE
+      # ORA-03135 connection lost contact
+      LOST_CONNECTION_ERROR_CODES = [28, 1012, 3113, 3114, 3135] # :nodoc:
+
       class ConnectionException < StandardError # :nodoc:
       end
     end

lib/active_record/connection_adapters/oracle_enhanced/jdbc_connection.rb

@@ -263,7 +263,7 @@ def with_retry(allow_retry: false, &block)
           begin
             yield if block_given?
           rescue Java::JavaSql::SQLException => e
-            raise unless /^(Closed Connection|Io exception:|No more data to read from socket|IO Error:|ORA-03113:|ORA-03114:|ORA-17008:)/.match?(e.message)
+            raise unless lost_connection?(e)
             @active = false
             raise unless should_retry
             should_retry = false
@@ -537,6 +537,17 @@ def error_code(exception)
           end
         end
 
+        # JDBC SQLException messages that signal a dropped connection
+        # without a meaningful Oracle error code attached. ORA-17008
+        # (Closed Connection) surfaces as the "Closed Connection" message.
+        LOST_CONNECTION_MESSAGE = /\A(Closed Connection|Io exception:|No more data to read from socket|IO Error:)/
+
+        def lost_connection?(exception)
+          return false unless exception.is_a?(Java::JavaSql::SQLException)
+          LOST_CONNECTION_ERROR_CODES.include?(exception.getErrorCode) ||
+            LOST_CONNECTION_MESSAGE.match?(exception.message)
+        end
+
         def get_ruby_value_from_result_set(rset, i, type_name, get_lob_value = true)
           case type_name
           when :NUMBER

lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb

@@ -251,6 +251,10 @@ def error_code(exception)
           end
         end
 
+        def lost_connection?(exception)
+          exception.is_a?(OCIError) && LOST_CONNECTION_ERROR_CODES.include?(exception.code)
+        end
+
         def typecast_result_value(value, get_lob_value)
           case value
           when Integer
@@ -435,21 +439,14 @@ def reset! # :nodoc:
     end
   end
 
-  # ORA-00028: your session has been killed
-  # ORA-01012: not logged on
-  # ORA-03113: end-of-file on communication channel
-  # ORA-03114: not connected to ORACLE
-  # ORA-03135: connection lost contact
-  LOST_CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114, 3135 ] # :nodoc:
-
   # Adds auto-recovery functionality.
   def with_retry(allow_retry: false) # :nodoc:
     should_retry = (allow_retry || self.class.auto_retry?) && autocommit?
 
     begin
       yield
     rescue OCIException => e
-      raise unless e.is_a?(OCIError) && LOST_CONNECTION_ERROR_CODES.include?(e.code)
+      raise unless e.is_a?(OCIError) && ActiveRecord::ConnectionAdapters::OracleEnhanced::LOST_CONNECTION_ERROR_CODES.include?(e.code)
       @active = false
       raise unless should_retry
       should_retry = false

lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -799,6 +799,8 @@ def extract_limit(sql_type) # :nodoc:
       end
 
       def translate_exception(exception, message:, sql:, binds:) # :nodoc:
+        return ActiveRecord::ConnectionFailed.new(message, sql: sql, binds: binds, connection_pool: @pool) if _connection.lost_connection?(exception)
+
         case _connection.error_code(exception)
         when 1
           RecordNotUnique.new(message, sql: sql, binds: binds)

spec/active_record/connection_adapters/oracle_enhanced/connection_spec.rb

@@ -475,6 +475,13 @@ def kill_current_session
       @sys_conn.exec "ALTER SYSTEM KILL SESSION '#{sid_serial}' IMMEDIATE"
     end
 
+    def connection_id_from_server(conn)
+      audsid = conn.select("SELECT userenv('sessionid') audsid FROM dual").first["audsid"]
+      @sys_conn.select("SELECT s.sid||','||s.serial# sid_serial
+          FROM   v$session s
+          WHERE  audsid = '#{audsid}'").first["sid_serial"]
+    end
+
     it "should reconnect and execute SQL statement if connection is lost and auto retry is enabled" do
       # @conn.auto_retry = true
       ActiveRecord::Base.connection.auto_retry = true
@@ -487,6 +494,21 @@ def kill_current_session
       expect(@conn.exec("SELECT * FROM dual", allow_retry: true)).not_to be_nil
     end
 
+    # Regression test ported from rails/rails#46273, which only covers
+    # Mysql2 and PostgreSQL in the Rails repository.
+    it "adapter #execute is retryable when allow_retry: true is passed" do
+      previous_auto_retry = ActiveRecord::Base.connection.auto_retry
+      ActiveRecord::Base.connection.auto_retry = false
+      begin
+        initial_connection_id = connection_id_from_server(@conn)
+        kill_current_session
+        expect { ActiveRecord::Base.connection.execute("SELECT 1 FROM dual", allow_retry: true) }.not_to raise_error
+        expect(connection_id_from_server(@conn)).not_to eq(initial_connection_id)
+      ensure
+        ActiveRecord::Base.connection.auto_retry = previous_auto_retry
+      end
+    end
+
     it "should not reconnect and execute SQL statement if connection is lost and auto retry is disabled" do
       # @conn.auto_retry = false
       ActiveRecord::Base.connection.auto_retry = false