mongo 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18e71f41caf0b6b8c618c8ea7cedb903ca10248949993c6c25ebf61d6acf3bba
-  data.tar.gz: bd587a35aadbaf790b61c83867f276bd13858c6469fb8ef26bf3907e58a5703a
+  metadata.gz: d640dac0ce599ea7aa742522d55ead0bd20a2f3f4d9a8c632c28eb5090d38b44
+  data.tar.gz: cb6993b9aa97c89f93e6e4018aaa7f2f5de0473566162364d5f8beb6f49df2b8
 SHA512:
-  metadata.gz: c923c55b783fb6d0a37d90116684afe65c038d1d7c06dfa1ace59a825eeee441ad7384f42ab45cb47bc7f2abedc16faef6f5f8adef68751631dcc57ddbca8be1
-  data.tar.gz: bff45797b2533f2d842787c9c1d63eef76deab4471244af4d759237ab122b70d3c785d2ad064bf0b79e3d045c86efa5f6f7f47e4b8cdec5607b95ffd323400d3
+  metadata.gz: 11e03d68d1209e627911032bc2e818c77d100afde0f7b5b0b3166c4b52be2224f50299d086edbfb41b20151e5ea8985cb1c79b095047d72c313830836fd8b4b3
+  data.tar.gz: f450cba2ee21f571c4eb9e94029dc1d883158409fb9e7d2012633466b4445cb659264e0d2f971a0b3b96d699c631cc6d444e20ff5183a18a428b1ced7518f463

data/lib/mongo/client.rb

@@ -709,7 +709,7 @@ module Mongo
       cmd = { listDatabases: 1 }
       cmd[:nameOnly] = !!name_only
       cmd[:filter] = filter unless filter.empty?
-      use(Database::ADMIN).command(cmd, opts).first[Database::DATABASES]
+      use(Database::ADMIN).database.read_command(cmd, opts).first[Database::DATABASES]
     end
 
     # Returns a list of Mongo::Database objects.

data/lib/mongo/collection.rb

@@ -212,7 +212,7 @@ module Mongo
     #
     # @since 2.0.0
     def capped?
-      database.command(:collstats => name).documents[0][CAPPED]
+      database.read_command(:collstats => name).documents[0][CAPPED]
     end
 
     # Force the collection to be created in the database.

data/lib/mongo/database.rb

@@ -159,6 +159,37 @@ module Mongo
     #
     # @return [ Hash ] The result of the command execution.
     def command(operation, opts = {})
+      txn_read_pref = if opts[:session] && opts[:session].in_transaction?
+        opts[:session].txn_read_preference
+      else
+        nil
+      end
+      txn_read_pref ||= opts[:read] || ServerSelector::PRIMARY
+      Lint.validate_underscore_read_preference(txn_read_pref)
+      selector = ServerSelector.get(txn_read_pref)
+
+      client.send(:with_session, opts) do |session|
+        server = selector.select_server(cluster, nil, session)
+        Operation::Command.new({
+          :selector => operation.dup,
+          :db_name => name,
+          :read => selector,
+          :session => session
+        }).execute(server)
+      end
+    end
+
+    # Execute a read command on the database, retrying the read if necessary.
+    #
+    # @param [ Hash ] operation The command to execute.
+    # @param [ Hash ] opts The command options.
+    #
+    # @option opts :read [ Hash ] The read preference for this command.
+    # @option opts :session [ Session ] The session to use for this command.
+    #
+    # @return [ Hash ] The result of the command execution.
+    # @api private
+    def read_command(operation, opts = {})
       txn_read_pref = if opts[:session] && opts[:session].in_transaction?
         opts[:session].txn_read_preference
       else

data/lib/mongo/server_selector/selectable.rb

@@ -193,6 +193,12 @@ module Mongo
           servers = candidates(cluster)
           if Lint.enabled?
             servers.each do |server|
+              # It is possible for a server to have a nil average RTT here
+              # because the ARTT comes from description which may be updated
+              # by a background thread while server selection is running.
+              # Currently lint mode is not a public feature, if/when this
+              # changes (https://jira.mongodb.org/browse/RUBY-1576) the
+              # requirement for ARTT to be not nil would need to be removed.
               if server.average_round_trip_time.nil?
                 raise Error::LintError, "Server #{server.address} has nil average rtt"
               end
@@ -361,11 +367,34 @@ module Mongo
       # @since 2.0.0
       def near_servers(candidates = [], local_threshold = nil)
         return candidates if candidates.empty?
-        nearest_server = candidates.min_by(&:average_round_trip_time)
+
+        # Average RTT on any server may change at any time by the server
+        # monitor's background thread. ARTT may also become nil if the
+        # server is marked unknown. Take a snapshot of ARTTs for the duration
+        # of this method.
+
+        candidates = candidates.map do |server|
+          {server: server, artt: server.average_round_trip_time}
+        end.reject do |candidate|
+          candidate[:artt].nil?
+        end
+
+        return candidates if candidates.empty?
+
+        nearest_candidate = candidates.min_by do |candidate|
+          candidate[:artt]
+        end
+
         # Default for legacy signarure
         local_threshold ||= self.local_threshold
-        threshold = nearest_server.average_round_trip_time + local_threshold
-        candidates.select { |server| server.average_round_trip_time <= threshold }.shuffle!
+
+        threshold = nearest_candidate[:artt] + local_threshold
+
+        candidates.select do |candidate|
+          candidate[:artt] <= threshold
+        end.map do |candidate|
+          candidate[:server]
+        end.shuffle!
       end
 
       # Select the servers matching the defined tag sets.

data/lib/mongo/version.rb

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

data/spec/integration/retryable_writes_spec.rb

@@ -737,4 +737,21 @@ describe 'Retryable writes integration tests' do
 
     it_behaves_like 'an operation that does not support retryable writes'
   end
+
+  context 'when the operation is database#command' do
+
+    let(:operation) do
+      collection.database.command(ping: 1)
+    end
+
+    let(:expectation) do
+      0
+    end
+
+    let(:unsuccessful_retry_value) do
+      0
+    end
+
+    it_behaves_like 'an operation that does not support retryable writes'
+  end
 end

data/spec/mongo/server_selector_spec.rb

@@ -564,4 +564,49 @@ describe Mongo::ServerSelector do
       it_behaves_like 'staleness filter'
     end
   end
+
+  describe '#candidates' do
+    let(:selector) { Mongo::ServerSelector::Primary.new(options) }
+
+    let(:cluster) { double('cluster') }
+
+    let(:options) { {} }
+
+    context 'sharded' do
+      let(:servers) do
+        [make_server(:mongos)]
+      end
+
+      before do
+        allow(cluster).to receive(:single?).and_return(false)
+        allow(cluster).to receive(:sharded?).and_return(true)
+        allow(cluster).to receive(:options).and_return({})
+        allow(cluster).to receive(:servers).and_return(servers)
+      end
+
+      it 'returns the servers' do
+        expect(selector.candidates(cluster)).to eq(servers)
+      end
+
+      context 'with local threshold' do
+        let(:options) do
+          {local_threshold: 1}
+        end
+
+        it 'returns the servers' do
+          expect(selector.candidates(cluster)).to eq(servers)
+        end
+
+        context 'when servers become unknown' do
+          let(:servers) do
+            [make_server(:unknown)]
+          end
+
+          it 'returns an empty list' do
+            expect(selector.candidates(cluster)).to eq([])
+          end
+        end
+      end
+    end
+  end
 end

data/spec/support/common_shortcuts.rb

@@ -74,7 +74,11 @@ module CommonShortcuts
 
     def make_server(mode, options = {})
       tags = options[:tags] || {}
-      average_round_trip_time = options[:average_round_trip_time] || 0
+      average_round_trip_time = if mode == :unknown
+        nil
+      else
+        options[:average_round_trip_time] || 0
+      end
 
       if mode == :unknown
         ismaster = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Tyler Brock
@@ -31,7 +31,7 @@ cert_chain:
   bMYVwXXhV8czdzgkQB/ZPWHSbEWXnmkze1mzvqWBCPOVXYrcnL9cnEl/RoxtS1hr
   Db6Ac6mCUSYfYHBWpWqxjc45n70i5Xi1
   -----END CERTIFICATE-----
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson