rails-pg-adapter 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8492318d406e356186bb5d0830087f1e3c21eeeefbc806b0881680a026c3e85b
-  data.tar.gz: 52d95814d9f0df186c464932e4a81f30ff6d2aabf8715740b64d4973877a7681
+  metadata.gz: b13533de6e67440feaaee7799c583984672793b16b10aee60ca89091cadef545
+  data.tar.gz: e6927d01f1604871d426d8fa894dc400ac3626191c151b034b12771ee68b91ac
 SHA512:
-  metadata.gz: f51318474f857c6733e86f7cb6a19d7d2e7d84cd4de5125b780e1a44a7ff8bdb6325e9dd934c197b47566bf6d359454e0fc0761563b64e5629d752fa2886f10c
-  data.tar.gz: 7a98ab05cc5d99a1b26244ea000634fd4efdb8d855a1c81c101342e6aa1149ecac01fd5c8131837ff3ae0ae9d75e1c98bdbed2974be7c38e9810643b22580d8b
+  metadata.gz: d60b542abec512d9f5d1567f65d4327e3bc299d8ac740616fbec5aeb394f612698db6c74f5a462640cd96bdb1fb7013ff433f28780ef5cb5c3c0157ca0fa10b4
+  data.tar.gz: 16bbac80afd152b275c451243331318be772c88b9dcce2ddb1eb30be5875556f489b476b55e3b34ec618e6047a00405ca6d9caa73729d83d480101c1849a0ec8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.1.7] - 2023-04-21
+
+- Simplify connection management and introduce upper bound to retries
+
 ## [0.1.6] - 2023-04-19
 
 - Disconnect and remove connection when in read-only

data/lib/rails_pg_adapter/patch.rb

@@ -13,34 +13,55 @@ module RailsPgAdapter
       "the database system is starting up",
       "connection is closed",
       "could not connect",
+      "is not currently accepting connections",
     ].freeze
     CONNECTION_ERROR_RE = /#{CONNECTION_ERROR.map { |w| Regexp.escape(w) }.join("|")}/.freeze
 
     CONNECTION_SCHEMA_ERROR = ["PG::UndefinedColumn"].freeze
     CONNECTION_SCHEMA_RE = /#{CONNECTION_SCHEMA_ERROR.map { |w| Regexp.escape(w) }.join("|")}/.freeze
 
-    CONNECTION_READ_ONLY_ERROR = [
-      "read-only",
-      "PG::ReadOnlySqlTransaction",
-    ].freeze
-    CONNECTION_READ_ONLY_ERROR_RE = /#{CONNECTION_READ_ONLY_ERROR.map { |w| Regexp.escape(w) }.join("|")}/.freeze
-
     private
 
     def exec_cache(*args)
-      super(*args)
-    rescue ::ActiveRecord::StatementInvalid, ::ActiveRecord::ConnectionNotEstablished => e
-      raise unless supported_errors?(e)
-
-      try_reconnect?(e) ? retry : handle_error(e)
+      sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      begin
+        super(*args)
+      rescue ::ActiveRecord::StatementInvalid,
+             ::ActiveRecord::ConnectionNotEstablished,
+             ::ActiveRecord::NoDatabaseError => e
+        raise unless supported_errors?(e)
+
+        if try_reconnect?(e)
+          sleep_time = sleep_times.shift
+          handle_error(e) unless sleep_time
+          warn("Retry query failed, retrying again in #{sleep_time} sec.")
+          sleep(sleep_time)
+          retry
+        else
+          handle_error(e)
+        end
+      end
     end
 
     def exec_no_cache(*args)
-      super(*args)
-    rescue ::ActiveRecord::StatementInvalid, ::ActiveRecord::ConnectionNotEstablished => e
-      raise unless supported_errors?(e)
-
-      try_reconnect?(e) ? retry : handle_error(e)
+      sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      begin
+        super(*args)
+      rescue ::ActiveRecord::StatementInvalid,
+             ::ActiveRecord::ConnectionNotEstablished,
+             ::ActiveRecord::NoDatabaseError => e
+        raise unless supported_errors?(e)
+
+        if try_reconnect?(e)
+          sleep_time = sleep_times.shift
+          handle_error(e) unless sleep_time
+          warn("Retry query failed, retrying again in #{sleep_time} sec.")
+          sleep(sleep_time)
+          retry
+        else
+          handle_error(e)
+        end
+      end
     end
 
     def try_reconnect?(e)
@@ -49,8 +70,7 @@ module RailsPgAdapter
       return false unless RailsPgAdapter.reconnect_with_backoff?
 
       begin
-        disconnect_and_remove_conn! if read_only_error?(e.message)
-        reconnect!
+        disconnect_conn!
         true
       rescue ::ActiveRecord::ConnectionNotEstablished
         false
@@ -60,11 +80,13 @@ module RailsPgAdapter
     def handle_error(e)
       if failover_error?(e.message) && RailsPgAdapter.failover_patch?
         warn("clearing connections due to #{e} - #{e.message}")
-        disconnect_and_remove_conn!
+        disconnect_conn!
         raise(e)
       end
 
-      return unless missing_column_error?(e.message) && RailsPgAdapter.reset_column_information_patch?
+      unless missing_column_error?(e.message) && RailsPgAdapter.reset_column_information_patch?
+        return
+      end
 
       warn("clearing column information due to #{e} - #{e.message}")
 
@@ -80,7 +102,7 @@ module RailsPgAdapter
       CONNECTION_SCHEMA_RE.match?(error_message)
     end
 
-    def disconnect_and_remove_conn!
+    def disconnect_conn!
       disconnect!
       ::ActiveRecord::Base.connection_pool.remove(::ActiveRecord::Base.connection)
     end
@@ -103,10 +125,6 @@ module RailsPgAdapter
       end
       false
     end
-
-    def read_only_error?(error_message)
-      CONNECTION_READ_ONLY_ERROR_RE.match?(error_message)
-    end
   end
 end
 
@@ -123,12 +141,12 @@ module ActiveRecord
           sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
           begin
             old_new_client_method.bind(self).call(args)
-          rescue ::ActiveRecord::ConnectionNotEstablished => e
+          rescue ::ActiveRecord::ConnectionNotEstablished, ::ActiveRecord::NoDatabaseError => e
             raise(e) unless RailsPgAdapter.failover_patch? && RailsPgAdapter.reconnect_with_backoff?
 
             sleep_time = sleep_times.shift
             raise unless sleep_time
-            warn( "Could not establish a connection from new_client, retrying again in #{sleep_time} sec.")
+            warn("Could not establish a connection from new_client, retrying again in #{sleep_time} sec.")
             sleep(sleep_time)
             retry
           end

data/lib/rails_pg_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsPgAdapter
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Tines Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails