mongo 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e500892649b1d8d1817ec229c1d56d97837e252452654af04e995d1416082a
-  data.tar.gz: 5fa8c7ca6caa84c0c81ed9f8ab3cd6566f579fc10ac28f510628f2de790040c7
+  metadata.gz: d35926db93b848daeb9bccff3503f99f9940ef9a0b4d0f777e24af6569005177
+  data.tar.gz: 7a543a6f1b40d2962a8c8252053580aca43d60530b2f40d9deb907a73db47bd2
 SHA512:
-  metadata.gz: 725de14593b44d0bf8b370f53a5e18a8f5d033efddd2e05096ec561b69f51b01b70394d3c8ebab1e89dbb7ecbb7784dbb161376d1194130ae6d016afd39344ae
-  data.tar.gz: 989ee85302acac376637d777e1c83cff4e7fa5d932fc62d489b3192d0b7336875fe831a0742d9953892108d2cb86c5b825f84d73a1779c0149fef2ffbb04aa05
+  metadata.gz: f44e3256afabfb3ac96950e7342f3ee9533bb0e50494140bdd81bf809938c26a58b501960268ad3e906c27b939890a91313f654e941132e7299ea550f142a11b
+  data.tar.gz: 66bb2f4bc9c1851fc6e48d8f048aa45d19f49ae635a8a0c97f5298756166a4b3c410a18e4daa1e98cf0443da8735981ab35845297f5c53891160b0904f9fdc42

checksums.yaml.gz.sig

@@ -1 +1,4 @@
-���Gg��r���X%'wC�~arS��x����p�=mU�)o�t��[�ȕ:��F"%*�?] ��L)^*�m�#�H������`�r�L�ƵvS����+��ܨ㨡o�3�1�����D�@�#�VG�R�����B�;�D��P>�[�.y��c��[���9�tJ����s�ǰ��J�:�(ҳ����@�
+���T�]�$M����'"�{�}���JT���c/�5�c@t橖!���W��k::�H&Za�}ؤ�1����n�K�7�?�60�<?
+%�����Ey;�ԫ��� ��:�1nФ
+�&(U��k���c��;��	�����C0���TpUQ�Ul�]�)܂����:��0S�
�OǷM���k5�{�z����3l>�o�:3����mP,�^+RI%�
+��ۗ�:)Ɓ�%&H�I�L����cx�;U!cKd�����f

data/lib/mongo/client.rb

@@ -258,15 +258,33 @@ module Mongo
     #   See Ruby's Zlib module for valid levels.
     # @option options [ true, false ] :retry_writes Retry writes once when
     #   connected to a replica set or sharded cluster versions 3.6 and up.
+    # @option options [ Proc ] :sdam_proc A Proc to invoke with the client
+    #   as the argument prior to performing server discovery and monitoring.
+    #   Use this to set up SDAM event listeners to receive events dispatched
+    #   during client construction.
     #
     # @since 2.0.0
     def initialize(addresses_or_uri, options = Options::Redacted.new)
       Mongo::Lint.validate_underscore_read_preference(options[:read])
       if addresses_or_uri.is_a?(::String)
-        create_from_uri(addresses_or_uri, validate_options!(options))
+        uri = URI.get(addresses_or_uri, options)
+        addresses = uri.servers
+        options = uri.client_options.merge(options)
       else
-        create_from_addresses(addresses_or_uri, validate_options!(options))
+        addresses = addresses_or_uri
       end
+      options = options.dup
+      # Special handling for sdam_proc as it is only used during client
+      # construction
+      sdam_proc = options.delete(:sdam_proc)
+      @options = validate_options!(Database::DEFAULT_OPTIONS.merge(options)).freeze
+      @database = Database.new(self, @options[:database], @options)
+      monitoring = Monitoring.new(@options)
+      if sdam_proc
+        @cluster = Cluster.new([], monitoring, @options)
+        sdam_proc.call(self)
+      end
+      @cluster = Cluster.new(addresses, monitoring, @options)
       yield(self) if block_given?
     end
 
@@ -401,7 +419,13 @@ module Mongo
     #
     # @since 2.1.0
     def reconnect
-      @cluster.reconnect! and true
+      addresses = cluster.addresses.map(&:to_s)
+      monitoring = cluster.monitoring
+
+      @cluster.disconnect! rescue nil
+
+      @cluster = Cluster.new(addresses, monitoring, options)
+      true
     end
 
     # Get the names of all databases.
@@ -526,19 +550,6 @@ module Mongo
       cluster.send(:with_session, self, options, &block)
     end
 
-    def create_from_addresses(addresses, opts = Options::Redacted.new)
-      @options = Database::DEFAULT_OPTIONS.merge(opts).freeze
-      @cluster = Cluster.new(addresses, Monitoring.new(options), options)
-      @database = Database.new(self, options[:database], options)
-    end
-
-    def create_from_uri(connection_string, opts = Options::Redacted.new)
-      uri = URI.get(connection_string, opts)
-      @options = validate_options!(Database::DEFAULT_OPTIONS.merge(uri.client_options.merge(opts))).freeze
-      @cluster = Cluster.new(uri.servers, @cluster ? monitoring : Monitoring.new(options), options)
-      @database = Database.new(self, options[:database], options)
-    end
-
     def initialize_copy(original)
       @options = original.options.dup
       @monitoring = @cluster ? monitoring : Monitoring.new(options)

data/lib/mongo/cluster/topology/replica_set.rb

@@ -213,6 +213,12 @@ module Mongo
         end
 
         # Whether a specific server in the cluster can be removed, given a description.
+        # As described in the SDAM spec, a server should be removed if the server's
+        # address does not match the "me" field of the isMaster response, if the server
+        # has a different replica set name, or if an isMaster response from the primary
+        # does not contain the server's address in the list of known hosts. Note that as
+        # described by the spec, a server determined to be of type Unknown from its
+        # isMaster response is NOT removed from the topology.
         #
         # @example Check if a specific server can be removed from the cluster.
         #   topology.remove_server?(description, server)
@@ -224,8 +230,10 @@ module Mongo
         #
         # @since 2.0.6
         def remove_server?(description, server)
+          ((server.address == description.address) && description.me_mismatch?) ||
           remove_self?(description, server) ||
             (member_of_this_set?(description) &&
+                description.server_type == :primary &&
                 !description.servers.empty? &&
                   !description.lists_server?(server))
         end
@@ -316,10 +324,14 @@ module Mongo
             description.replica_set_name == replica_set_name
         end
 
+        # As described by the SDAM spec, a server should be removed from the
+        # topology upon receiving its isMaster response if no error occurred
+        # and replica set name does not match that of the topology.
         def remove_self?(description, server)
-          !member_of_this_set?(description) &&
-            description.is_server?(server) &&
-              !description.ghost?
+          !description.unknown? &&
+            !member_of_this_set?(description) &&
+              description.is_server?(server) &&
+                !description.ghost?
         end
       end
     end

data/lib/mongo/error/lint_error.rb

@@ -28,7 +28,7 @@ module Mongo
     # to the server, to flag failures sooner. This exception is raised on
     # such failures.
     #
-    # @since 2.7.0
+    # @since 2.6.1
     class LintError < Error
     end
   end

data/lib/mongo/server/description.rb

@@ -640,7 +640,7 @@ module Mongo
       #
       # @since 2.0.6
       def me_mismatch?
-        !!(address.to_s != me if me)
+        !!(address.to_s.downcase != me.downcase if me)
       end
 
       # Check equality of two descriptions.

data/lib/mongo/version.rb

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

data/spec/integration/reconnect_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe 'Client after reconnect' do
+  let(:client) { authorized_client }
+
+  it 'works' do
+    client['test'].insert_one('testk' => 'testv')
+
+    client.reconnect
+
+    doc = client['test'].find('testk' => 'testv').first
+    expect(doc).not_to be_nil
+    expect(doc['testk']).to eq('testv')
+  end
+
+  it 'recreates monitor thread' do
+    thread = client.cluster.servers.first.monitor.instance_variable_get('@thread')
+    expect(thread).to be_alive
+
+    thread.kill
+    # context switch to let the thread get killed
+    sleep 0.1
+    expect(thread).not_to be_alive
+
+    client.reconnect
+
+    new_thread = client.cluster.servers.first.monitor.instance_variable_get('@thread')
+    expect(new_thread).not_to eq(thread)
+    expect(new_thread).to be_alive
+  end
+end

data/spec/{mongo → integration}/transactions_examples_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
-describe 'transactions examples in Ruby', if: test_transactions? do
+describe 'Transactions examples' do
+  require_transaction_support
 
   let(:hr) do
     authorized_client.use(:hr).database
@@ -39,19 +40,16 @@ describe 'transactions examples in Ruby', if: test_transactions? do
       events_coll.insert_one({ employee: 3, status: { new: 'Inactive', old: 'Active' } },
                              session: session)
 
-      loop do
-        begin
-          session.commit_transaction
-          puts 'Transaction committed.'
-          break
-        rescue Mongo::Error => e
-          if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
-            puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation..."
-            next
-          else
-            puts 'Error during commit ...'
-            raise
-          end
+      begin
+        session.commit_transaction
+        puts 'Transaction committed.'
+      rescue Mongo::Error => e
+        if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
+          puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation..."
+          retry
+        else
+          puts 'Error during commit ...'
+          raise
         end
       end
     end
@@ -77,18 +75,15 @@ describe 'transactions examples in Ruby', if: test_transactions? do
       # Start Transactions Retry Example 1
 
       def run_transaction_with_retry(session)
-        loop do
-          begin
-            yield session # performs transaction
-            break
-          rescue Mongo::Error => e
+        begin
+          yield session # performs transaction
+        rescue Mongo::Error => e
 
-            puts 'Transaction aborted. Caught exception during transaction.'
-            raise unless e.label?(Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL)
+          puts 'Transaction aborted. Caught exception during transaction.'
+          raise unless e.label?(Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL)
 
-            puts "#{Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL}, retrying transaction ..."
-            next
-          end
+          puts "#{Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL}, retrying transaction ..."
+          retry
         end
       end
 
@@ -111,19 +106,16 @@ describe 'transactions examples in Ruby', if: test_transactions? do
       # Start Transactions Retry Example 2
 
       def commit_with_retry(session)
-        loop do
-          begin
-            session.commit_transaction
-            puts 'Transaction committed.'
-            break
-          rescue Mongo::Error=> e
-            if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
-              puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation..."
-              next
-            else
-              puts 'Error during commit ...'
-              raise
-            end
+        begin
+          session.commit_transaction
+          puts 'Transaction committed.'
+        rescue Mongo::Error=> e
+          if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
+            puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation..."
+            retry
+          else
+            puts 'Error during commit ...'
+            raise
           end
         end
       end
@@ -158,34 +150,27 @@ describe 'transactions examples in Ruby', if: test_transactions? do
       # Start Transactions Retry Example 3
 
       def run_transaction_with_retry(session)
-        loop do
-          begin
-            yield session # performs transaction
-            break
-          rescue Mongo::Error=> e
-            puts 'Transaction aborted. Caught exception during transaction.'
-            raise unless e.label?(Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL)
-
-            puts "#{Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL}, retrying transaction ..."
-            next
-          end
+        begin
+          yield session # performs transaction
+        rescue Mongo::Error => e
+          puts 'Transaction aborted. Caught exception during transaction.'
+          raise unless e.label?(Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL)
+          puts "#{Mongo::Error::TRANSIENT_TRANSACTION_ERROR_LABEL}, retrying transaction ..."
+          retry
         end
       end
 
       def commit_with_retry(session)
-        loop do
-          begin
-            session.commit_transaction
-            puts 'Transaction committed.'
-            break
-          rescue Mongo::Error => e
-            if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
-              puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation ..."
-              next
-            else
-              puts 'Error during commit ...'
-              raise
-            end
+        begin
+          session.commit_transaction
+          puts 'Transaction committed.'
+        rescue Mongo::Error => e
+          if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
+            puts "#{Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL}, retrying commit operation ..."
+            retry
+          else
+            puts 'Error during commit ...'
+            raise
           end
         end
       end

data/spec/lite_spec_helper.rb

@@ -37,13 +37,16 @@ begin
 rescue LoadError
 end
 
+require 'support/spec_config'
+
 Mongo::Logger.logger = Logger.new($stdout)
-unless %w(1 true yes).include?((ENV['CLIENT_DEBUG'] || '').downcase)
+unless SpecConfig.instance.client_debug?
   Mongo::Logger.logger.level = Logger::INFO
 end
 Encoding.default_external = Encoding::UTF_8
 
 require 'support/matchers'
+require 'support/lite_constraints'
 require 'support/event_subscriber'
 require 'support/server_discovery_and_monitoring'
 require 'support/server_selection_rtt'
@@ -57,7 +60,9 @@ require 'support/transactions'
 require 'support/change_streams'
 
 RSpec.configure do |config|
-  if ENV['CI'] && RUBY_PLATFORM =~ /\bjava\b/
+  if ENV['CI'] && SpecConfig.instance.jruby?
     config.formatter = 'documentation'
   end
+
+  config.extend(LiteConstraints)
 end

data/spec/mongo/address/unix_spec.rb

@@ -27,7 +27,7 @@ describe Mongo::Address::Unix do
   describe '#socket' do
 
     let(:address) do
-      '/tmp/mongodb-27017.sock'
+      "/tmp/mongodb-#{SpecConfig.instance.any_port}.sock"
     end
 
     let(:socket) do

data/spec/mongo/address_spec.rb

@@ -242,7 +242,7 @@ describe Mongo::Address do
 
       before do
         address.instance_variable_set(:@resolver, nil)
-        address.send(:initialize_resolver!, (SSL ? SSL_OPTIONS : {}))
+        address.send(:initialize_resolver!, (SpecConfig.instance.ssl? ? SSL_OPTIONS : {}))
       end
 
       it 'uses the host, not the IP address' do
@@ -250,7 +250,7 @@ describe Mongo::Address do
       end
 
       let(:socket) do
-        if running_ssl?
+        if SpecConfig.instance.ssl?
           address.socket(0.0, SSL_OPTIONS).instance_variable_get(:@tcp_socket)
         else
           address.socket(0.0).instance_variable_get(:@socket)
@@ -276,35 +276,35 @@ describe Mongo::Address do
       end
     end
   end
-  
+
   describe '#to_s' do
     context 'address with ipv4 host only' do
       let(:address) { Mongo::Address.new('127.0.0.1') }
-      
+
       it 'is host with port' do
         expect(address.to_s).to eql('127.0.0.1:27017')
       end
     end
-    
+
     context 'address with ipv4 host and port' do
       let(:address) { Mongo::Address.new('127.0.0.1:27000') }
-      
+
       it 'is host with port' do
         expect(address.to_s).to eql('127.0.0.1:27000')
       end
     end
-    
+
     context 'address with ipv6 host only' do
       let(:address) { Mongo::Address.new('::1') }
-      
+
       it 'is host with port' do
         expect(address.to_s).to eql('[::1]:27017')
       end
     end
-    
+
     context 'address with ipv6 host and port' do
       let(:address) { Mongo::Address.new('[::1]:27000') }
-      
+
       it 'is host with port' do
         expect(address.to_s).to eql('[::1]:27000')
       end

data/spec/mongo/auth/scram/conversation_spec.rb

@@ -204,7 +204,8 @@ describe Mongo::Auth::SCRAM::Conversation do
     end
   end
 
-  context 'when SCRAM-SHA-256 is used', if: scram_sha_256_enabled? do
+  context 'when SCRAM-SHA-256 is used' do
+    require_scram_sha_256_support
 
     let(:user) do
       Mongo::Auth::User.new(