rails_failover 0.5.1 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de312681fb912d8d00ffaaf362f8c2201a95066660759aa92393d3212753e6c9
-  data.tar.gz: 006af26908149488773d664dea57d761ff24304516ae7b65139b20d288f0ab85
+  metadata.gz: c3a3ec0058f66ac60c355117284cc6c3ef9edbde71d74d966e38c2e10d38b828
+  data.tar.gz: dbfbe03fe13a70ecbc32729ce47223e41b4d9c53d6baeb42df296391490b6116
 SHA512:
-  metadata.gz: 634c701d2d4ba73e4b45efed2de949797521c7d390586eeec412f3d6749d93b446bde1b51b53ddc37a41d0e3e79d18902a154a22e07f1bad8528d365822f0614
-  data.tar.gz: 7c4126b04c1792cb26c98f3532e3cc815d0aaca6aed9cda20831315f826075b362d23d5863c942415a018157553e156e24c9dff128751ea5138c59f6799efecd
+  metadata.gz: 7283bd61a7804eb4b5e501e03b71343c620e84f3b334665783a99d8c19fb135d5f49bb97d2f537938d4e73427086c7815981eb4c684b7ed3a38befd878014753
+  data.tar.gz: 3856f52865af591c157d29b0613382dd54a4614cc943313f373077db4ab950beaaba953f696faf7298304c283123e0b40ff48d29ea4d8672025ff7d49e778b1f

data/CHANGELOG.md

@@ -0,0 +1,42 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.5.6] - 2020-09-14
+
+- FIX: Iteration and mutation of primaries_down in separate threads (#5)
+
+  Ruby hashes can't be modified whilst they are being iterated over.
+
+  Here, the primaries_down hash is iterated over to check each previously
+  unavailable primary to see if it is now contactable. However, since this
+  hash can be updated in other threads, this iteration isn't safe.
+
+  To prevent this, a copy of the hash is iterated over instead.
+
+  The GIL should not be released during a hash dup [1], but let's not tie
+  ourselves unnecessarily to current MRI behaviour.
+
+  [1]: https://github.com/ruby-concurrency/concurrent-ruby/issues/528
+
+
+## [0.5.5] - 2020-08-04
+
+- FIX: Rescue from `Redis::TimeoutError` instead of `Timeout::Error`.
+
+## [0.5.4] - 2020-07-21
+
+- FIX: Undefined method on nil class error in forking servers.
+
+## [0.5.3] - 2020-07-20
+
+- FIX: Incorrectly rescuing from `PG::ServerError`.
+
+## [0.5.2] - 2020-06-23
+
+### Changed
+- FIX: Only rescue from connection errors.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_failover (0.5.1)
+    rails_failover (0.5.6)
       activerecord (~> 6.0)
       railties (~> 6.0)
 
@@ -41,19 +41,19 @@ GEM
     erubi (1.9.0)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    loofah (2.5.0)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
     parser (2.7.1.2)
       ast (~> 2.4.0)
     pg (1.2.3)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)

data/README.md

@@ -3,7 +3,7 @@
 Automatic failover and recovery for primary/replica setup for:
 
 1. Redis
-1. ActiveRecord (PostgreSQL/MySQL)
+1. ActiveRecord (PostgreSQL/MySQL Adapters)
 
 ## Installation
 

data/lib/rails_failover/active_record/middleware.rb

@@ -3,18 +3,20 @@
 module RailsFailover
   module ActiveRecord
     class Interceptor
-      def self.adapter_error
-        @adapter_error ||= begin
+      def self.adapter_errors
+        @adapter_errors ||= begin
           if defined?(::PG)
-            ::PG::Error
+            [::PG::UnableToSend, ::PG::ConnectionBad]
           elsif defined?(::Mysql2)
-            ::Mysql2::Error
+            [::Mysql2::Error::ConnectionError]
           end
         end
       end
 
       def self.handle(request, exception)
-        if (resolve_cause(exception).is_a?(adapter_error))
+        exception = resolve_cause(exception)
+
+        if adapter_errors.any? { |error| exception.is_a?(error) }
           Handler.instance.verify_primary(request.env[Middleware::WRITING_ROLE_HEADER])
         end
       end

data/lib/rails_failover/redis/connector.rb

@@ -11,7 +11,7 @@ module RailsFailover
         options[:driver] = Class.new(options[:driver]) do
           def self.connect(options)
             super(options)
-          rescue Timeout::Error,
+          rescue ::Redis::TimeoutError,
                  SocketError,
                  Errno::EADDRNOTAVAIL,
                  Errno::ECONNREFUSED,

data/lib/rails_failover/redis/handler.rb

@@ -63,7 +63,7 @@ module RailsFailover
 
         active_primaries_keys = {}
 
-        primaries_down.each do |key, options|
+        mon_synchronize { primaries_down.dup }.each do |key, options|
           info = nil
           options = options.dup
 
@@ -163,7 +163,7 @@ module RailsFailover
             @primaries_down[process_pid] = @primaries_down[@ancestor_pid] || {}
 
             if process_pid != @ancestor_pid
-              @primaries_down.delete(@ancestor_pid).each do |id, options|
+              @primaries_down.delete(@ancestor_pid)&.each do |id, options|
                 verify_primary(options)
               end
             end

data/lib/rails_failover/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsFailover
-  VERSION = "0.5.1"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_failover
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.6
 platform: ruby
 authors:
 - Alan Tan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -49,6 +49,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock