mongo 2.4.1 → 2.4.2

data/lib/mongo/retryable.rb

@@ -19,16 +19,6 @@ module Mongo
   # @since 2.1.0
   module Retryable
 
-    # The not master error message.
-    #
-    # @since 2.1.0
-    NOT_MASTER = 'not master'.freeze
-
-    # Could not contact primary error message, seen on stepdowns
-    #
-    # @since 2.2.0
-    COULD_NOT_CONTACT_PRIMARY = 'could not contact primary'.freeze
-
     # Execute a read operation with a retry.
     #
     # @api private
@@ -46,21 +36,22 @@ module Mongo
     # @return [ Result ] The result of the operation.
     #
     # @since 2.1.0
-    def read_with_retry(attempt = 0, &block)
+    def read_with_retry
+      attempt = 0
       begin
-        block.call
-      rescue Error::SocketError, Error::SocketTimeoutError
-        retry_operation(&block)
+        attempt += 1
+        yield
+      rescue Error::SocketError, Error::SocketTimeoutError => e
+        raise(e) if attempt > cluster.max_read_retries
+        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)
-            read_with_retry(attempt + 1, &block)
-          else
-            raise e
-          end
+          raise(e) if attempt > cluster.max_read_retries
+          log_retry(e)
+          sleep(cluster.read_retry_interval)
+          retry
         else
           raise e
         end
@@ -83,11 +74,10 @@ module Mongo
     # @return [ Result ] The result of the operation.
     #
     # @since 2.2.6
-    def read_with_one_retry(&block)
-      block.call
-    rescue Error::SocketError,
-           Error::SocketTimeoutError
-      block.call
+    def read_with_one_retry
+      yield
+    rescue Error::SocketError, Error::SocketTimeoutError
+      yield
     end
 
     # Execute a write operation with a retry.
@@ -107,23 +97,28 @@ module Mongo
     # @return [ Result ] The result of the operation.
     #
     # @since 2.1.0
-    def write_with_retry(&block)
+    def write_with_retry
+      attempt = 0
       begin
-        block.call
+        attempt += 1
+        yield
       rescue Error::OperationFailure => e
-        if e.message.include?(NOT_MASTER) || e.message.include?(COULD_NOT_CONTACT_PRIMARY)
-          retry_operation(&block)
+        raise(e) if attempt > Cluster::MAX_WRITE_RETRIES
+        if e.write_retryable?
+          log_retry(e)
+          cluster.scan!
+          retry
         else
-          raise e
+          raise(e)
         end
       end
     end
 
     private
 
-    def retry_operation(&block)
-      cluster.scan!
-      block.call
+    # Log a warning so that any application slow down is immediately obvious.
+    def log_retry(e)
+      Logger.logger.warn "Retry due to: #{e.class.name} #{e.message}"
     end
   end
 end

data/lib/mongo/socket.rb

@@ -177,7 +177,7 @@ module Mongo
         end
       rescue IO::WaitReadable
         select_timeout = (deadline - Time.now) if deadline
-        unless Kernel::select([@socket], nil, [@socket], select_timeout)
+        if (select_timeout && select_timeout <= 0) || !Kernel::select([@socket], nil, [@socket], select_timeout)
           raise Timeout::Error.new("Took more than #{timeout} seconds to receive data.")
         end
         retry

data/lib/mongo/socket/tcp.rb

@@ -43,6 +43,7 @@ module Mongo
       def connect!
         Timeout.timeout(timeout, Error::SocketTimeoutError) do
           socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1)
+          socket.setsockopt(SOL_SOCKET, SO_KEEPALIVE, true)
           handle_errors { socket.connect(::Socket.pack_sockaddr_in(port, host)) }
           self
         end

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.4.1'.freeze
+  VERSION = '2.4.2'.freeze
 end

data/spec/mongo/bulk_write_spec.rb

@@ -20,7 +20,7 @@ describe Mongo::BulkWrite do
   end
 
   let(:collection_invalid_write_concern) do
-    authorized_collection.client.with(write: { w: (WRITE_CONCERN[:w] + 1) })[authorized_collection.name]
+    authorized_collection.client.with(write: INVALID_WRITE_CONCERN)[authorized_collection.name]
   end
 
   let(:collation) do
@@ -680,11 +680,16 @@ describe Mongo::BulkWrite do
             authorized_collection.insert_one({ _id: 0 })
           end
 
-          it 'replaces the document' do
+          it 'replaces the document', if: write_command_enabled? do
             expect(result.modified_count).to eq(1)
             expect(authorized_collection.find(_id: 0).first[:name]).to eq('test')
           end
 
+          it 'replaces the document', unless: write_command_enabled? do
+            expect(result.modified_count).to be_nil
+            expect(authorized_collection.find(_id: 0).first[:name]).to eq('test')
+          end
+
           context 'when there is a write concern error' do
 
             context 'when the server version is < 2.6' do
@@ -718,29 +723,33 @@ describe Mongo::BulkWrite do
                                 collation: collation }}]
             end
 
-            context 'when the server selected supports collations', if: collation_enabled? do
+            context 'when the server selected supports collations' do
 
               let!(:result) do
                 bulk_write.execute
               end
 
-              it 'applies the collation' do
+              it 'applies the collation', if: collation_enabled? do
                 expect(authorized_collection.find(other: 'pong').count).to eq(1)
               end
 
-              it 'reports the upserted id' do
+              it 'reports the upserted id', if: collation_enabled? do
                 expect(result.upserted_ids).to eq([])
               end
 
-              it 'reports the upserted count' do
+              it 'reports the upserted count', if: collation_enabled? do
                 expect(result.upserted_count).to eq(0)
               end
 
-              it 'reports the modified count' do
+              it 'reports the modified count', if: collation_enabled? && write_command_enabled? do
                 expect(result.modified_count).to eq(1)
               end
 
-              it 'reports the matched count' do
+              it 'returns nil for the modified count', if: collation_enabled? && !write_command_enabled? do
+                expect(result.modified_count).to be_nil
+              end
+
+              it 'reports the matched count', if: collation_enabled? do
                 expect(result.matched_count).to eq(1)
               end
             end
@@ -796,10 +805,14 @@ describe Mongo::BulkWrite do
               expect(result.upserted_count).to eq(0)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(0)
             end
 
+            it 'returns nil as the modified count', unless: write_command_enabled?  do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
               expect(result.matched_count).to eq(0)
             end
@@ -835,10 +848,14 @@ describe Mongo::BulkWrite do
               expect(result.upserted_count).to eq(0)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(1)
             end
 
+            it 'returns nil for the modified count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
               expect(result.matched_count).to eq(1)
             end
@@ -865,6 +882,10 @@ describe Mongo::BulkWrite do
                 expect(result.modified_count).to eq(0)
               end
 
+              it 'returns nil for the modified count', unless: write_command_enabled? do
+                expect(result.modified_count).to be_nil
+              end
+
               it 'reports the matched count' do
                 expect(result.matched_count).to eq(1)
               end
@@ -925,10 +946,14 @@ describe Mongo::BulkWrite do
               expect(result.upserted_count).to eq(1)
             end
 
-            it 'reports the modified_count count' do
+            it 'reports the modified_count count', if: write_command_enabled? do
               expect(result.modified_count).to eq(0)
             end
 
+            it 'returns nil for the modified_count count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
               expect(result.matched_count).to eq(0)
             end
@@ -971,29 +996,33 @@ describe Mongo::BulkWrite do
                                collation: collation }}]
             end
 
-            context 'when the server selected supports collations', if: collation_enabled? do
+            context 'when the server selected supports collations' do
 
               let!(:result) do
                 bulk_write.execute
               end
 
-              it 'applies the collation' do
+              it 'applies the collation', if: collation_enabled? do
                 expect(authorized_collection.find(name: 'pong').count).to eq(1)
               end
 
-              it 'reports the upserted id' do
+              it 'reports the upserted id', if: collation_enabled? do
                 expect(result.upserted_ids).to eq([])
               end
 
-              it 'reports the upserted count' do
+              it 'reports the upserted count', if: collation_enabled? do
                 expect(result.upserted_count).to eq(0)
               end
 
-              it 'reports the modified count' do
+              it 'reports the modified count', if: collation_enabled? && write_command_enabled? do
                 expect(result.modified_count).to eq(1)
               end
 
-              it 'reports the matched count' do
+              it 'returns nil for the modified count', if: collation_enabled? && !write_command_enabled? do
+                expect(result.modified_count).to be_nil
+              end
+
+              it 'reports the matched count', if: collation_enabled? do
                 expect(result.matched_count).to eq(1)
               end
             end
@@ -1049,10 +1078,14 @@ describe Mongo::BulkWrite do
               expect(result.upserted_count).to eq(0)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(0)
             end
 
+            it 'returns nil for the modified count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
               expect(result.matched_count).to eq(0)
             end
@@ -1077,29 +1110,33 @@ describe Mongo::BulkWrite do
                                collation: collation }}]
             end
 
-            context 'when the server selected supports collations', if: collation_enabled? do
+            context 'when the server selected supports collations' do
 
               let!(:result) do
                 bulk_write.execute
               end
 
-              it 'applies the collation' do
+              it 'applies the collation', if: collation_enabled? do
                 expect(authorized_collection.find(name: 'pong').count).to eq(2)
               end
 
-              it 'reports the upserted id' do
+              it 'reports the upserted id', if: collation_enabled? do
                 expect(result.upserted_ids).to eq([])
               end
 
-              it 'reports the upserted count' do
+              it 'reports the upserted count', if: collation_enabled? do
                 expect(result.upserted_count).to eq(0)
               end
 
-              it 'reports the modified count' do
+              it 'reports the modified count', if: collation_enabled? && write_command_enabled? do
                 expect(result.modified_count).to eq(2)
               end
 
-              it 'reports the matched count' do
+              it 'returns nil for the modified count', if: collation_enabled? && !write_command_enabled? do
+                expect(result.modified_count).to be_nil
+              end
+
+              it 'reports the matched count', if: collation_enabled? do
                 expect(result.matched_count).to eq(2)
               end
             end
@@ -1160,10 +1197,14 @@ describe Mongo::BulkWrite do
               expect(result.upserted_count).to eq(0)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(0)
             end
 
+            it 'returns nil for the modified count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
               expect(result.matched_count).to eq(0)
             end
@@ -1197,10 +1238,14 @@ describe Mongo::BulkWrite do
               expect(result.upserted_count).to eq(0)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(2)
             end
 
+            it 'returns nil for the modified count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
               expect(result.matched_count).to eq(2)
             end
@@ -1238,8 +1283,8 @@ describe Mongo::BulkWrite do
                 expect(result.modified_count).to eq(1)
               end
 
-              it 'reports the modified count', unless: write_command_enabled? do
-                expect(result.modified_count).to eq(2)
+              it 'returns nil for the modified count', unless: write_command_enabled? do
+                expect(result.modified_count).to be_nil
               end
 
               it 'reports the matched count' do
@@ -1280,19 +1325,28 @@ describe Mongo::BulkWrite do
               bulk_write.execute
             end
 
-            it 'updates the document' do
+            it 'updates the document', if: write_command_enabled? do
               expect(result.modified_count).to eq(0)
               expect(authorized_collection.find(name: { '$in' => ['test', 'test1'] }).count).to eq(2)
             end
 
+            it 'updates the document', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+              expect(authorized_collection.find(name: { '$in' => ['test', 'test1'] }).count).to eq(2)
+            end
+
             it 'reports the upserted count' do
               expect(result.upserted_count).to eq(2)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(0)
             end
 
+            it 'returns nil for the modified count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
               expect(result.matched_count).to eq(0)
             end
@@ -1335,8 +1389,8 @@ describe Mongo::BulkWrite do
                 expect(result.modified_count).to eq(1)
               end
 
-              it 'reports the modified count', unless: write_command_enabled? do
-                expect(result.modified_count).to eq(2)
+              it 'returns nil for the modified count', unless: write_command_enabled? do
+                expect(result.modified_count).to be_nil
               end
 
               it 'reports the matched count' do
@@ -1382,29 +1436,33 @@ describe Mongo::BulkWrite do
                                 collation: collation }}]
             end
 
-            context 'when the server selected supports collations', if: collation_enabled? do
+            context 'when the server selected supports collations' do
 
               let!(:result) do
                 bulk_write.execute
               end
 
-              it 'applies the collation' do
+              it 'applies the collation', if: collation_enabled? do
                 expect(authorized_collection.find(name: 'pong').count).to eq(2)
               end
 
-              it 'reports the upserted id' do
+              it 'reports the upserted id', if: collation_enabled? do
                 expect(result.upserted_ids).to eq([])
               end
 
-              it 'reports the upserted count' do
+              it 'reports the upserted count', if: collation_enabled? do
                 expect(result.upserted_count).to eq(0)
               end
 
-              it 'reports the modified count' do
+              it 'reports the modified count', if: collation_enabled? && write_command_enabled? do
                 expect(result.modified_count).to eq(2)
               end
 
-              it 'reports the matched count' do
+              it 'returns nil for the modified count', if: collation_enabled? && !write_command_enabled? do
+                expect(result.modified_count).to be_nil
+              end
+
+              it 'reports the matched count', if: collation_enabled? do
                 expect(result.matched_count).to eq(2)
               end
             end
@@ -1461,12 +1519,16 @@ describe Mongo::BulkWrite do
               expect(result.upserted_count).to eq(0)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(0)
             end
 
+            it 'returns nil for the modified count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
-              expect(result.matched_count).to eq(0)
+              expect(result.matched_count).to be(0)
             end
           end
 
@@ -1496,10 +1558,14 @@ describe Mongo::BulkWrite do
               expect(result.upserted_count).to eq(0)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(2)
             end
 
+            it 'returns nil for the modified count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the matched count' do
               expect(result.matched_count).to eq(2)
             end
@@ -1549,10 +1615,14 @@ describe Mongo::BulkWrite do
               expect(result.matched_count).to eq(0)
             end
 
-            it 'reports the modified count' do
+            it 'reports the modified count', if: write_command_enabled? do
               expect(result.modified_count).to eq(0)
             end
 
+            it 'returns nil for the modified count', unless: write_command_enabled? do
+              expect(result.modified_count).to be_nil
+            end
+
             it 'reports the upserted id', if: write_command_enabled? do
               expect(result.upserted_ids).to eq([0])
             end
@@ -1813,7 +1883,7 @@ describe Mongo::BulkWrite do
               ops, :bypass_document_validation => true)
         end
 
-        it 'executes successfully' do
+        it 'executes successfully', if: write_command_enabled? do
           expect(result2.modified_count).to eq(2)
           expect(result2.inserted_count).to eq(1)
         end