mongo_ha 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c07613ccc0db614856311ea723d0bb980bd53113
-  data.tar.gz: f449fd924fd37daac5bfd82d3d13950422d895d9
+  metadata.gz: ae55c68a2fcb98cbbc45ce2c38b9704568b0a840
+  data.tar.gz: 32f0cc03e5b4d8b4b5ffc971b3d6c095ee23ee00
 SHA512:
-  metadata.gz: 4e65723c5ba6bb1ac48c2095c353ee6ca048d49016e92db7329f8820a568b95a63949151f0831a3a3379f477b9673d1c9f999749f2e4d623e56a5a3f2651abbe
-  data.tar.gz: 83e9ccb94dc81194df0c87b8558def4f5d17efff66297071c43ab3ed4b48c52d019a4175921b87418fcd44e42d9543b282c765d3e88bcbb8e91c8b1e5b192e8a
+  metadata.gz: 924d0fed8af1570863e16f4708856719c1826e9efb959304b6c82baa0993c68101371595a8369db8e83628346a619a2670384cbf44b7c1489cacc24f1af1d07e
+  data.tar.gz: 6faa9a2bc05a2d1fb703fb32335d43da13f10e79274b299bddd4ba2594ad5df8918ec9fcaa6aa70fbe5a485d3b1d330aec218e28040838802e9966ed7949f495

data/README.md

@@ -24,6 +24,9 @@ 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

data/lib/mongo_ha/retryable.rb

@@ -3,20 +3,22 @@ require 'mongo/retryable'
 module Mongo
   module Retryable
 
-    def read_with_retry(attempt = 0, &block)
+    def read_with_retry
+      attempt = 0
       begin
-        block.call
+        attempt += 1
+        yield
       rescue Error::SocketError, Error::SocketTimeoutError => e
-        retry_operation(e, &block)
+        raise(e) if attempt > cluster.max_read_retries
+        retry_reconnect(e)
+        retry
       rescue Error::OperationFailure => e
-        # TODO: Non sharded, retryable due to Replicaset primary change
-
         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)
-            read_with_retry(attempt + 1, &block)
+            retry
           else
             raise e
           end
@@ -26,36 +28,47 @@ module Mongo
       end
     end
 
-    def read_with_one_retry(&block)
-      block.call
+    def read_with_one_retry
+      yield
     rescue Error::SocketError, Error::SocketTimeoutError => e
-      Logger.logger.warn "Single retry due to: #{e.class.name} #{e.message}"
-      block.call
+      retry_reconnect(e)
+      yield
     end
 
-    def write_with_retry(&block)
+    def write_with_retry
+      attempt = 0
       begin
-        block.call
+        attempt += 1
+        yield
       rescue Error::SocketError => e
-        # During a master move in a replica-set the master closes existing client connections.
-        # Note: Small possibility the write occurs twice.
-        retry_operation(e, &block)
+        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)
+        retry
       rescue Error::OperationFailure => e
+        raise(e) if attempt >= cluster.max_read_retries
         if e.write_retryable?
-          retry_operation(e, &block)
+          retry_reconnect(e)
+          retry
         else
-          raise e
+          raise(e)
         end
       end
     end
 
     private
 
-    # Log a warning on retry to prevent appearance of "hanging" during a failover.
-    def retry_operation(e, &block)
+    def retry_reconnect(e)
       Logger.logger.warn "Retry due to: #{e.class.name} #{e.message}"
+      sleep(cluster.read_retry_interval)
       cluster.scan!
-      block.call
     end
 
   end

data/lib/mongo_ha/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_ha
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo