mongo 2.9.0 → 2.9.1.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd46b61214fcac244d0cbec169da07133ded518cc61f6da7f93ae38005326efc
-  data.tar.gz: b9fde5cb3b1060705a04cdbf6656f0b30f183acc341b6c9ae2e74322675bf358
+  metadata.gz: 8e682274ba299fe9da1e373641236dd929ad81784a68a8f873a0461343835980
+  data.tar.gz: 9b5aba8b96ee2a5d7c1cf3f0df73ca93de5ce0e921da3df2e45fb165d6a28bbd
 SHA512:
-  metadata.gz: 897c70fc6cdb9d4a839c7cce246c3ff588ccae10b574ab8da7cd62f91860fb792b4ab74a6cc317dd9d80c03384d38d843dcc9119bb6ce71b35cb87d271eed30f
-  data.tar.gz: 849350864e0f5d29dcc9f1c2b5b623e0fd0ec61d028a8270a980ebe1e2cb0a764706f984d63f2206794d0fefca5610dd0f9edcec734faece59b0a8e32f4e7d38
+  metadata.gz: 7afd6d03c3c5c5691c5b34bab63a0deddb95d779bbaf1d80e011ade79856e65cc3677d77388a89cedfa9d56f70c528d88210e76aeff3b8d65b30026bee8cc5d6
+  data.tar.gz: 28f0da296a9852c66a14cc19c1578168ccd549f0f1e9a0c9a143fb109d7ae57ab74c84a90569415219c039840ca59145420cc8e10f0a04413b10638d00ad3217

data/lib/mongo/client.rb

@@ -346,14 +346,10 @@ module Mongo
       else
         options = {}
       end
-      unless options[:retry_reads] == false
-        options[:retry_reads] = true
-      end
-      unless options[:retry_writes] == false
-        options[:retry_writes] = true
-      end
+
       Lint.validate_underscore_read_preference(options[:read])
       Lint.validate_read_concern_option(options[:read_concern])
+
       if addresses_or_uri.is_a?(::String)
         uri = URI.get(addresses_or_uri, options)
         addresses = uri.servers
@@ -361,6 +357,14 @@ module Mongo
       else
         addresses = addresses_or_uri
       end
+
+      unless options[:retry_reads] == false
+        options[:retry_reads] = true
+      end
+      unless options[:retry_writes] == false
+        options[:retry_writes] = true
+      end
+
       # Special handling for sdam_proc as it is only used during client
       # construction
       sdam_proc = options.delete(:sdam_proc)

data/lib/mongo/server.rb

@@ -417,7 +417,23 @@ module Mongo
 
     # @api private
     def update_description(description)
+      prev_description = monitor.instance_variable_get('@description')
       monitor.instance_variable_set('@description', description)
+      if description.unknown? && !prev_description.unknown?
+        # This clears redundantly sometimes and also clears the pool on
+        # 4.2+ servers after not master errors which should not be done.
+        # Driver version 2.11+ has the correct implementation.
+        clear_connection_pool
+      end
+    end
+
+    # @api private
+    def clear_connection_pool
+      @pool_lock.synchronize do
+        if @pool
+          @pool.disconnect!
+        end
+      end
     end
 
     # @api private

data/lib/mongo/version.rb

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

data/spec/integration/sdam_error_handling_spec.rb

@@ -5,8 +5,64 @@ describe 'SDAM error handling' do
     ClientRegistry.instance.close_all_clients
   end
 
+  # These tests operate on specific servers, and don't work in a multi
+  # shard cluster where multiple servers are equally eligible
+  require_topology :replica_set
+
+  let(:client) { authorized_client_without_any_retries }
+
+  let(:server) { client.cluster.next_primary }
+
+  shared_examples_for 'marks server unknown' do
+    it 'marks server unknown' do
+      expect(server).not_to be_unknown
+      operation
+      expect(server).to be_unknown
+    end
+  end
+
+  shared_examples_for 'does not mark server unknown' do
+    it 'does not mark server unknown' do
+      expect(server).not_to be_unknown
+      operation
+      expect(server).not_to be_unknown
+    end
+  end
+
+  shared_examples_for 'requests server scan' do
+    it 'requests server scan' do
+      expect(server.monitor.scan_semaphore).to receive(:signal)
+      operation
+    end
+  end
+
+  shared_examples_for 'does not request server scan' do
+    it 'does not request server scan' do
+      expect(server.monitor.scan_semaphore).not_to receive(:signal)
+      operation
+    end
+  end
+
+  shared_examples_for 'clears connection pool' do
+    it 'clears connection pool' do
+      generation = server.pool.generation
+      operation
+      new_generation = server.pool.generation
+      # Temporary hack to allow repeated pool clears
+      expect(new_generation).to be >= generation + 1
+    end
+  end
+
+  shared_examples_for 'does not clear connection pool' do
+    it 'does not clear connection pool' do
+      generation = server.pool.generation
+      operation
+      new_generation = server.pool.generation
+      expect(new_generation).to eq(generation)
+    end
+  end
+
   describe 'when there is an error during an operation' do
-    let(:client) { authorized_client_without_any_retries }
 
     before do
       wait_for_all_servers(client.cluster)
@@ -15,12 +71,10 @@ describe 'SDAM error handling' do
       # have different behavior from non-handshake errors
       client.database.command(ping: 1)
       client.cluster.servers_list.each do |server|
-        server.monitor.stop!(true)
+        server.monitor.stop!
       end
     end
 
-    let(:server) { client.cluster.next_primary }
-
     let(:operation) do
       expect_any_instance_of(Mongo::Server::Connection).to receive(:deliver).and_return(reply)
       expect do
@@ -28,54 +82,6 @@ describe 'SDAM error handling' do
       end.to raise_error(Mongo::Error::OperationFailure, exception_message)
     end
 
-    shared_examples_for 'marks server unknown' do
-      it 'marks server unknown' do
-        expect(server).not_to be_unknown
-        operation
-        expect(server).to be_unknown
-      end
-    end
-
-    shared_examples_for 'does not mark server unknown' do
-      it 'does not mark server unknown' do
-        expect(server).not_to be_unknown
-        operation
-        expect(server).not_to be_unknown
-      end
-    end
-
-    shared_examples_for 'requests server scan' do
-      it 'requests server scan' do
-        expect(server.monitor.scan_semaphore).to receive(:signal)
-        operation
-      end
-    end
-
-    shared_examples_for 'does not request server scan' do
-      it 'does not request server scan' do
-        expect(server.monitor.scan_semaphore).not_to receive(:signal)
-        operation
-      end
-    end
-
-    shared_examples_for 'clears connection pool' do
-      it 'clears connection pool' do
-        generation = server.pool.generation
-        operation
-        new_generation = server.pool.generation
-        expect(new_generation).to eq(generation + 1)
-      end
-    end
-
-    shared_examples_for 'does not clear connection pool' do
-      it 'does not clear connection pool' do
-        generation = server.pool.generation
-        operation
-        new_generation = server.pool.generation
-        expect(new_generation).to eq(generation)
-      end
-    end
-
     shared_examples_for 'not master or node recovering' do
       it_behaves_like 'marks server unknown'
       it_behaves_like 'requests server scan'
@@ -83,7 +89,8 @@ describe 'SDAM error handling' do
       context 'server 4.2 or higher' do
         min_server_fcv '4.2'
 
-        it_behaves_like 'does not clear connection pool'
+        # Due to RUBY-1894 backport, the pool is cleared here
+        it_behaves_like 'clears connection pool'
       end
 
       context 'server 4.0 or lower' do
@@ -165,4 +172,39 @@ describe 'SDAM error handling' do
       end
     end
   end
+
+  # These tests fail intermittently in Evergreen
+  describe 'when there is an error on monitoring connection', retry: 3 do
+    let(:client) do
+      authorized_client_without_any_retries.with(
+        connect_timeout: 1, socket_timeout: 1)
+    end
+
+    let(:operation) do
+      expect(server.monitor.connection).not_to be nil
+      expect(server.monitor.connection).to receive(:ismaster).at_least(:once).and_raise(exception)
+      server.monitor.scan_semaphore.broadcast
+      6.times do
+        sleep 0.5
+        if server.unknown?
+          break
+        end
+      end
+      expect(server).to be_unknown
+    end
+
+    context 'non-timeout network error' do
+      let(:exception) { Mongo::Error::SocketError }
+
+      it_behaves_like 'marks server unknown'
+      it_behaves_like 'clears connection pool'
+    end
+
+    context 'network timeout' do
+      let(:exception) { Mongo::Error::SocketTimeoutError }
+
+      it_behaves_like 'marks server unknown'
+      it_behaves_like 'clears connection pool'
+    end
+  end
 end

data/spec/integration/step_down_spec.rb

@@ -154,7 +154,8 @@ describe 'Step down behavior' do
           collection.insert_one(test: 1)
         end.to raise_error(Mongo::Error::OperationFailure, /10107/)
 
-        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(0)
+        # Temporarily add 1 due to RUBY-1894 backport
+        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(0+1)
       end
     end
 
@@ -173,7 +174,8 @@ describe 'Step down behavior' do
           collection.insert_one(test: 1)
         end.to raise_error(Mongo::Error::OperationFailure, /10107/)
 
-        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1)
+        # Temporarily add 1 due to RUBY-1894 backport
+        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1+1)
       end
     end
 
@@ -190,7 +192,8 @@ describe 'Step down behavior' do
           collection.insert_one(test: 1)
         end.to raise_error(Mongo::Error::OperationFailure, /11600/)
 
-        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1)
+        # Temporarily add 1 due to RUBY-1894 backport
+        expect(event_subscriber.select_published_events(Mongo::Monitoring::Event::Cmap::PoolCleared).count).to eq(1+1)
       end
     end
   end

data/spec/mongo/client_construction_spec.rb

@@ -742,6 +742,52 @@ describe Mongo::Client do
             end
           end
         end
+
+        context 'when retryReads URI option is given' do
+
+          context 'it is false' do
+            let!(:uri) do
+              'mongodb://127.0.0.1:27017/testdb?retryReads=false'
+            end
+
+            it 'sets the option on the client' do
+              expect(client.options[:retry_reads]).to be false
+            end
+          end
+
+          context 'it is true' do
+            let!(:uri) do
+              'mongodb://127.0.0.1:27017/testdb?retryReads=true'
+            end
+
+            it 'sets the option on the client' do
+              expect(client.options[:retry_reads]).to be true
+            end
+          end
+        end
+
+        context 'when retryWrites URI option is given' do
+
+          context 'it is false' do
+            let!(:uri) do
+              'mongodb://127.0.0.1:27017/testdb?retryWrites=false'
+            end
+
+            it 'sets the option on the client' do
+              expect(client.options[:retry_writes]).to be false
+            end
+          end
+
+          context 'it is true' do
+            let!(:uri) do
+              'mongodb://127.0.0.1:27017/testdb?retryWrites=true'
+            end
+
+            it 'sets the option on the client' do
+              expect(client.options[:retry_writes]).to be true
+            end
+          end
+        end
       end
 
       context 'when options are provided not in the string' do

data/spec/mongo/server/connection_spec.rb

@@ -270,6 +270,7 @@ describe Mongo::Server::Connection, retry: 3 do
       end
     end
 
+=begin These assertions require a working cluster with working SDAM flow, which the tests do not configure
     shared_examples_for 'does not disconnect connection pool' do
       it 'does not disconnect non-monitoring sockets' do
         allow(server).to receive(:pool).and_return(pool)
@@ -285,6 +286,7 @@ describe Mongo::Server::Connection, retry: 3 do
         error
       end
     end
+=end
 
     let(:auth_mechanism) do
       if ClusterConfig.instance.server_version >= '3'
@@ -331,14 +333,14 @@ describe Mongo::Server::Connection, retry: 3 do
             expect(error).to be_a(Mongo::Auth::Unauthorized)
           end
 
-          it_behaves_like 'disconnects connection pool'
+          #it_behaves_like 'disconnects connection pool'
           it_behaves_like 'keeps server type and topology'
         end
 
         # need a separate context here, otherwise disconnect expectation
         # is ignored due to allowing disconnects in the other context
         context 'checking pool disconnection' do
-          it_behaves_like 'disconnects connection pool'
+          #it_behaves_like 'disconnects connection pool'
         end
       end
 
@@ -368,7 +370,7 @@ describe Mongo::Server::Connection, retry: 3 do
           expect(error).to be_a(Mongo::Error::SocketTimeoutError)
         end
 
-        it_behaves_like 'does not disconnect connection pool'
+        #it_behaves_like 'does not disconnect connection pool'
         it_behaves_like 'keeps server type and topology'
       end
 
@@ -398,7 +400,7 @@ describe Mongo::Server::Connection, retry: 3 do
           expect(error).to be_a(Mongo::Error::SocketError)
         end
 
-        it_behaves_like 'disconnects connection pool'
+        #it_behaves_like 'disconnects connection pool'
         it_behaves_like 'marks server unknown'
       end
 
@@ -706,7 +708,8 @@ describe Mongo::Server::Connection, retry: 3 do
         end
 
         it 'disconnects connection pool' do
-          expect(server.pool).to receive(:disconnect!)
+          # Allow multiple calls due to RUBY-1894 backport
+          expect(server.pool).to receive(:disconnect!).at_least(:once)
           result
         end
 
@@ -739,10 +742,12 @@ describe Mongo::Server::Connection, retry: 3 do
           expect(connection).to_not be_connected
         end
 
+=begin These assertions require a working cluster with working SDAM flow, which the tests do not configure
         it 'does not disconnect connection pool' do
           expect(server.pool).not_to receive(:disconnect!)
           result
         end
+=end
 
         it 'does not mark server unknown' do
           expect(server).not_to be_unknown

data/spec/mongo/server/monitor/connection_spec.rb

@@ -11,7 +11,7 @@ describe Mongo::Server::Monitor::Connection do
   end
 
   let(:address) do
-    client.cluster.next_primary.address
+    Mongo::Address.new(ClusterConfig.instance.primary_address, options)
   end
 
   declare_topology_double
@@ -31,6 +31,8 @@ describe Mongo::Server::Monitor::Connection do
                       Mongo::Event::Listeners.new, options)
   end
 
+  let(:monitor) { server.monitor }
+
   let(:connection) do
     # NB this connection is set up in the background thread,
     # when the :scan option to client is changed to default to false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1.rc0
 platform: ruby
 authors:
 - Tyler Brock
@@ -31,7 +31,7 @@ cert_chain:
   bMYVwXXhV8czdzgkQB/ZPWHSbEWXnmkze1mzvqWBCPOVXYrcnL9cnEl/RoxtS1hr
   Db6Ac6mCUSYfYHBWpWqxjc45n70i5Xi1
   -----END CERTIFICATE-----
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -1088,11 +1088,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB