mongo_ha 2.0.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae55c68a2fcb98cbbc45ce2c38b9704568b0a840
-  data.tar.gz: 32f0cc03e5b4d8b4b5ffc971b3d6c095ee23ee00
+SHA256:
+  metadata.gz: 81ceebba66286ee047edc336a2002178c3f4be2c020249b3fa1735329c88b72f
+  data.tar.gz: 9917438968b6fc4289bf496352a6ea4ac4f20fc05fe7a815b21f9365fd29f92d
 SHA512:
-  metadata.gz: 924d0fed8af1570863e16f4708856719c1826e9efb959304b6c82baa0993c68101371595a8369db8e83628346a619a2670384cbf44b7c1489cacc24f1af1d07e
-  data.tar.gz: 6faa9a2bc05a2d1fb703fb32335d43da13f10e79274b299bddd4ba2594ad5df8918ec9fcaa6aa70fbe5a485d3b1d330aec218e28040838802e9966ed7949f495
+  metadata.gz: 5d3cef755e934e7b3b9e61155fbd38273f0a754f0c83ba1f2b741fc8e34a386ed703ea5fbbef0390a3b2deff3dc7ac46f5ec6eb0a9c91aaa999003213093ea4b
+  data.tar.gz: 8bbb7915a3bfcea4513e1c7d04f92f8d9a15a4bd2b1f1065e2875c81a0cc5a0cf8bd9f37eb514d0c254af20a4c9cda9c3a18ec3f8c7290ba8c90a4679e027fba

data/README.md

@@ -4,7 +4,16 @@ High availability for the mongo ruby driver. Automatic reconnects and recovery w
 
 ## Status
 
-Production Ready: Used every day in an enterprise environment across remote data centers.
+Most of the features of this gem were accepted into the mongo-ruby-client gem. :tada:
+
+There are still a few outstanding changes that are only available with this gem:
+* Retry on writes due to a master change.
+* Retry on writes due to loss of network connectivity.
+* Retry on reads during an operation failure other than when in a cluster.
+
+## Note
+
+It is recommended to use mongo_ha v2.5 along with the Mongo Ruby Client v2.5 to get the latest HA capabilities. 
 
 ## Overview
 
@@ -22,19 +31,12 @@ In the event of a connection failure, only one thread will attempt to re-establi
 connectivity to the Mongo server(s). This is to prevent swamping the mongo
 servers with reconnect attempts.
 
-Supports Ruby Mongo driver V1 and V2
-
-NOTE: The Ruby Mongo driver V2.4.0 does not work yet, since it sometimes fails to refresh its view of the
- replicaset after `cluster.scan!` is called. Use V2.3 for now.
-
-`mongo_ha` transparently supports `MongoMapper` and `Mongoid` which use the mongo ruby driver.
-
 ## Installation
 
 Add to Gemfile:
 
 ```ruby
-gem 'mongo_ha'
+gem 'mongo_ha', '~> 2.5'
 ```
 
 Or for standalone environments

data/lib/mongo_ha.rb

@@ -1,3 +1,2 @@
 require 'mongo'
-require 'mongo_ha/operation_failure'
 require 'mongo_ha/retryable'

data/lib/mongo_ha/retryable.rb

@@ -10,66 +10,34 @@ module Mongo
         yield
       rescue Error::SocketError, Error::SocketTimeoutError => e
         raise(e) if attempt > cluster.max_read_retries
-        retry_reconnect(e)
+        log_retry(e)
+        cluster.scan!
         retry
       rescue Error::OperationFailure => e
-        if cluster.sharded? && e.retryable?
-          if attempt < cluster.max_read_retries
-            # We don't scan the cluster in this case as Mongos always returns
-            # ready after a ping no matter what the state behind it is.
-            sleep(cluster.read_retry_interval)
-            retry
-          else
-            raise e
-          end
-        else
-          raise e
-        end
+        raise(e) if !e.retryable? || (attempt > cluster.max_read_retries)
+        log_retry(e)
+        cluster.sharded? ? sleep(cluster.read_retry_interval) : cluster.scan!
+        retry
       end
     end
 
-    def read_with_one_retry
-      yield
-    rescue Error::SocketError, Error::SocketTimeoutError => e
-      retry_reconnect(e)
-      yield
-    end
-
-    def write_with_retry
+    def write_with_retry(session, server_selector)
       attempt = 0
       begin
         attempt += 1
-        yield
-      rescue Error::SocketError => e
-        raise(e) if attempt >= cluster.max_read_retries
-        # During a replicaset master change the primary immediately closes all existing client connections.
-        #
-        # Note:
-        #   Small possibility the write occurs twice.
-        #   Usually this is acceptable since most applications would just retry the write anyway.
-        #   The ideal way is to check if the write succeeded, or just use a primary key to
-        #   prevent multiple writes etc.
-        #   In production we have not seen duplicates using this retry mechanism.
-        retry_reconnect(e)
+        yield(server_selector.call)
+      rescue Error::SocketError, Error::SocketTimeoutError => e
+        raise(e) if attempt > cluster.max_read_retries
+        log_retry(e)
+        cluster.scan!
         retry
       rescue Error::OperationFailure => e
-        raise(e) if attempt >= cluster.max_read_retries
-        if e.write_retryable?
-          retry_reconnect(e)
-          retry
-        else
-          raise(e)
-        end
+        raise(e) if !e.write_retryable? || (attempt > cluster.max_read_retries)
+        log_retry(e)
+        cluster.scan!
+        retry
       end
     end
 
-    private
-
-    def retry_reconnect(e)
-      Logger.logger.warn "Retry due to: #{e.class.name} #{e.message}"
-      sleep(cluster.read_retry_interval)
-      cluster.scan!
-    end
-
   end
 end

data/lib/mongo_ha/version.rb

@@ -1,3 +1,3 @@
 module MongoHA #:nodoc
-  VERSION = '2.0.1'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_ha
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.5.0
 description: Automatic reconnects and recovery when replica-set changes, or connections
   are lost, with transparent recovery
 email:
@@ -35,7 +35,6 @@ files:
 - LICENSE.txt
 - README.md
 - lib/mongo_ha.rb
-- lib/mongo_ha/operation_failure.rb
 - lib/mongo_ha/retryable.rb
 - lib/mongo_ha/version.rb
 homepage: https://github.com/reidmorrison/mongo_ha
@@ -58,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: High availability for the mongo ruby driver

data/lib/mongo_ha/operation_failure.rb

@@ -1,34 +0,0 @@
-require 'mongo/error/operation_failure'
-
-module Mongo
-  class Error
-    class OperationFailure
-      WRITE_RETRY_MESSAGES = [
-        'no master',
-        'not master',
-        'could not contact primary',
-        'Not primary'
-      ]
-
-      remove_const :RETRY_MESSAGES
-      RETRY_MESSAGES = WRITE_RETRY_MESSAGES + [
-        'transport error',
-        'socket exception',
-        "can't connect",
-        'connect failed',
-        'error querying',
-        'could not get last error',
-        'connection attempt failed',
-        'interrupted at shutdown',
-        'unknown replica set',
-        'dbclient error communicating with server'
-      ]
-
-      def write_retryable?
-        WRITE_RETRY_MESSAGES.any? { |m| message.include?(m) }
-      end
-
-    end
-  end
-end
-