mongo 2.2.0.rc0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc9c2c71373a6cf0c7ecc20e34dc665a3609113
-  data.tar.gz: b0586f936825521d4d1b720aaab115094c754b52
+  metadata.gz: 0b03a2e7ce5246f9d38690f731f53d29a5469d30
+  data.tar.gz: aaca95e6f570d466155c87d4c549a4f3c5bc0341
 SHA512:
-  metadata.gz: 4bd095acd88b753375c7b32441645a7f79bd6e79fa66c4b49d1d16f98a17a3ebb88628132d863dee8a49132b0ad06cd540fc329b37d3250e1793ecf0ce0fbb55
-  data.tar.gz: 8081fad549d197c92f9b573694b32a1813030fcde279e98ab117dd9d4b601b5bb2139a720c218b03fadd3315a8a9f391066f7ad96c99f194ce1cf186b6a56673
+  metadata.gz: f6fa180a5c94bcb5d7a809d170c8ec12ec28d0d6035575ef0cc677b9f4c68ec81c26411948f071945b2b2d829b192e0312f29416d2c3a589830c5ee40f90b133
+  data.tar.gz: fce85899375de257592434225cd1db4e3d3971e8b85b6ec111ef30c967e0fa0e817569b843dc0f3c342d7e58749c259a8111cc2b9d741ef321dc335a1ad08bab

data/lib/mongo/address.rb

@@ -63,6 +63,20 @@ module Mongo
       host == other.host && port == other.port
     end
 
+    # Check equality for hashing.
+    #
+    # @example Check hashing equality.
+    #   address.eql?(other)
+    #
+    # @param [ Object ] other The other object.
+    #
+    # @return [ true, false ] If the objects are equal.
+    #
+    # @since 2.2.0
+    def eql?(other)
+      self == other
+    end
+
     # Calculate the hash value for the address.
     #
     # @example Calculate the hash value.

data/lib/mongo/cluster.rb

@@ -106,12 +106,34 @@ module Mongo
       @options = options.freeze
       @topology = Topology.initial(seeds, options)
       @update_lock = Mutex.new
+      @pool_lock = Mutex.new
 
       subscribe_to(Event::STANDALONE_DISCOVERED, Event::StandaloneDiscovered.new(self))
       subscribe_to(Event::DESCRIPTION_CHANGED, Event::DescriptionChanged.new(self))
       subscribe_to(Event::PRIMARY_ELECTED, Event::PrimaryElected.new(self))
 
       seeds.each{ |seed| add(seed) }
+      ObjectSpace.define_finalizer(self, self.class.finalize(pools))
+    end
+
+    # Finalize the cluster for garbage collection. Disconnects all the scoped
+    # connection pools.
+    #
+    # @example Finalize the cluster.
+    #   Cluster.finalize(pools)
+    #
+    # @param [ Hash<Address, Server::ConnectionPool> ] pools The connection
+    #   pools.
+    #
+    # @return [ Proc ] The Finalizer.
+    #
+    # @since 2.2.0
+    def self.finalize(pools)
+      proc do
+        pools.values.each do |pool|
+          pool.disconnect!
+        end
+      end
     end
 
     # Get the nicer formatted string for use in inspection.
@@ -168,6 +190,22 @@ module Mongo
       options[:max_read_retries] || MAX_READ_RETRIES
     end
 
+    # Get the scoped connection pool for the server.
+    #
+    # @example Get the connection pool.
+    #   cluster.pool(server)
+    #
+    # @param [ Server ] server The server.
+    #
+    # @return [ Server::ConnectionPool ] The connection pool.
+    #
+    # @since 2.2.0
+    def pool(server)
+      @pool_lock.synchronize do
+        pools[server.address] ||= Server::ConnectionPool.get(server)
+      end
+    end
+
     # Get the interval, in seconds, in which a mongos read operation is
     # retried.
     #
@@ -339,6 +377,10 @@ module Mongo
       !@topology.single? || direct_connection?(address)
     end
 
+    def pools
+      @pools ||= {}
+    end
+
     def servers_list
       @update_lock.synchronize do
         @servers.reduce([]) do |servers, server|

data/lib/mongo/dbref.rb

@@ -79,7 +79,7 @@ module Mongo
     # @example Convert the DBRef to raw BSON.
     #   dbref.to_bson
     #
-    # @param [ String ] encoded The encoded BSON to append to.
+    # @param [ String ] buffer The encoded BSON buffer to append to.
     #
     # @return [ String ] The raw BSON.
     #
@@ -92,7 +92,7 @@ module Mongo
 
       # Deserialize the hash from BSON, converting to a DBRef if appropriate.
       #
-      # @param [ IO ] bson The bson representing a hash.
+      # @param [ String ] buffer The bson representing a hash.
       #
       # @return [ Hash, DBRef ] The decoded hash or DBRef.
       #

data/lib/mongo/grid/file/chunk.rb

@@ -128,7 +128,7 @@ module Mongo
         # @example Convert the chunk to BSON.
         #   chunk.to_bson
         #
-        # @param [ String ] encoded The encoded data to append to.
+        # @param [ String ] buffer The encoded data buffer to append to.
         #
         # @return [ String ] The raw BSON data.
         #

data/lib/mongo/protocol/bit_vector.rb

@@ -24,7 +24,7 @@ module Mongo
 
         # Initializes a BitVector with a layout
         #
-        # @param layout [Array<Symbol>] the array of fields in the bit vector
+        # @param layout [ Array<Symbol> ] the array of fields in the bit vector
         def initialize(layout)
           @masks = {}
           layout.each_with_index do |field, index|
@@ -34,9 +34,10 @@ module Mongo
 
         # Serializes vector by encoding each symbol according to its mask
         #
-        # @param buffer [IO] Buffer to receive the serialized vector
-        # @param value [Array<Symbol>] Array of flags to encode
-        # @return [IO] Buffer that received the serialized vector
+        # @param buffer [ String ] Buffer to receive the serialized vector
+        # @param value [ Array<Symbol> ] Array of flags to encode
+        #
+        # @return [ String ] Buffer that received the serialized vector
         def serialize(buffer, value)
           bits = 0
           value.each { |flag| bits |= @masks[flag] }
@@ -45,8 +46,9 @@ module Mongo
 
         # Deserializes vector by decoding the symbol according to its mask
         #
-        # @param io [IO] Stream containing the vector to be deserialized
-        # @return [Array<Symbol>] Flags contained in the vector
+        # @param [ String ] buffer Buffer containing the vector to be deserialized.
+        #
+        # @return [ Array<Symbol> ] Flags contained in the vector
         def deserialize(buffer)
           vector = buffer.get_int32
           flags = []

data/lib/mongo/protocol/serializers.rb

@@ -46,17 +46,19 @@ module Mongo
 
         # Serializes the header value into the buffer
         #
-        # @param buffer [String] Buffer to receive the serialized value.
-        # @param value [String] Header value to be serialized.
-        # @return [String] Buffer with serialized value.
+        # @param buffer [ String ] Buffer to receive the serialized value.
+        # @param value [ String ] Header value to be serialized.
+        #
+        # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value)
           buffer.put_bytes(value.pack(HEADER_PACK))
         end
 
         # Deserializes the header value from the IO stream
         #
-        # @param io [IO] IO stream containing the message header.
-        # @return [Array<Fixnum>] Array consisting of the deserialized
+        # @param [ String ] buffer Buffer containing the message header.
+        #
+        # @return [ Array<Fixnum> ] Array consisting of the deserialized
         #   length, request id, response id, and op code.
         def self.deserialize(buffer)
           buffer.get_bytes(16).unpack(HEADER_PACK)
@@ -70,9 +72,10 @@ module Mongo
 
         # Serializes a C style string into the buffer
         #
-        # @param buffer [String] Buffer to receive the serialized CString.
-        # @param value [String] The string to be serialized.
-        # @return [String] Buffer with serialized value.
+        # @param buffer [ String ] Buffer to receive the serialized CString.
+        # @param value [ String ] The string to be serialized.
+        #
+        # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value)
           buffer.put_cstring(value)
         end
@@ -85,9 +88,10 @@ module Mongo
 
         # Serializes a 32-bit Zero into the buffer
         #
-        # @param buffer [String] Buffer to receive the serialized Zero.
-        # @param value [Fixnum] Ignored value.
-        # @return [String] Buffer with serialized value.
+        # @param buffer [ String ] Buffer to receive the serialized Zero.
+        # @param value [ Fixnum ] Ignored value.
+        #
+        # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value)
           buffer.put_int32(ZERO)
         end
@@ -100,8 +104,9 @@ module Mongo
 
         # Serializes a fixnum to a 4-byte 32-bit integer
         #
-        # @param buffer [String] Buffer to receive the serialized Int32.
-        # @param value [Fixnum] 32-bit integer to be serialized.
+        # @param buffer [ String ] Buffer to receive the serialized Int32.
+        # @param value [ Fixnum ] 32-bit integer to be serialized.
+        #
         # @return [String] Buffer with serialized value.
         def self.serialize(buffer, value)
           buffer.put_int32(value)
@@ -109,8 +114,9 @@ module Mongo
 
         # Deserializes a 32-bit Fixnum from the IO stream
         #
-        # @param io [IO] IO stream containing the 32-bit integer
-        # @return [Fixnum] Deserialized Int32
+        # @param [ String ] buffer Buffer containing the 32-bit integer
+        #
+        # @return [ Fixnum ] Deserialized Int32
         def self.deserialize(buffer)
           buffer.get_int32
         end
@@ -123,16 +129,18 @@ module Mongo
 
         # Serializes a fixnum to an 8-byte 64-bit integer
         #
-        # @param buffer [String] Buffer to receive the serialized Int64.
-        # @param value [Fixnum] 64-bit integer to be serialized.
-        # @return [String] Buffer with serialized value.
+        # @param buffer [ String ] Buffer to receive the serialized Int64.
+        # @param value [ Fixnum ] 64-bit integer to be serialized.
+        #
+        # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value)
           buffer.put_int64(value)
         end
 
         # Deserializes a 64-bit Fixnum from the IO stream
         #
-        # @param io [IO] IO stream containing the 64-bit integer.
+        # @param [ String ] buffer Buffer containing the 64-bit integer.
+        #
         # @return [Fixnum] Deserialized Int64.
         def self.deserialize(buffer)
           buffer.get_int64
@@ -146,9 +154,10 @@ module Mongo
 
         # Serializes a document into the buffer
         #
-        # @param buffer [String] Buffer to receive the BSON encoded document.
-        # @param value [Hash] Document to serialize as BSON.
-        # @return [String] Buffer with serialized value.
+        # @param buffer [ String ] Buffer to receive the BSON encoded document.
+        # @param value [ Hash ] Document to serialize as BSON.
+        #
+        # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value, max_bson_size = nil)
           start_size = buffer.length
           value.to_bson(buffer)
@@ -159,8 +168,9 @@ module Mongo
 
         # Deserializes a document from the IO stream
         #
-        # @param io [IO] IO stream containing the BSON encoded document.
-        # @return [Hash] The decoded BSON document.
+        # @param [ String ] buffer Buffer containing the BSON encoded document.
+        #
+        # @return [ Hash ] The decoded BSON document.
         def self.deserialize(buffer)
           BSON::Document.from_bson(buffer)
         end

data/lib/mongo/server.rb

@@ -120,6 +120,19 @@ module Mongo
       monitor.stop! and true
     end
 
+    # When the server is flagged for garbage collection, stop the monitor
+    # thread.
+    #
+    # @example Finalize the object.
+    #   Server.finalize(monitor)
+    #
+    # @param [ Server::Monitor ] monitor The server monitor.
+    #
+    # @since 2.2.0
+    def self.finalize(monitor)
+      proc { monitor.stop! }
+    end
+
     # Instantiate a new server object. Will start the background refresh and
     # subscribe to the appropriate events.
     #
@@ -145,6 +158,7 @@ module Mongo
       @monitor = Monitor.new(address, event_listeners, options)
       monitor.scan!
       monitor.run!
+      ObjectSpace.define_finalizer(self, self.class.finalize(monitor))
     end
 
     # Get a pretty printed server inspection.
@@ -168,7 +182,7 @@ module Mongo
     #
     # @since 2.0.0
     def pool
-      @pool ||= ConnectionPool.get(self)
+      @pool ||= cluster.pool(self)
     end
 
     # Determine if the provided tags are a subset of the server's tags.

data/lib/mongo/server/connection_pool.rb

@@ -23,9 +23,6 @@ module Mongo
     class ConnectionPool
       include Loggable
 
-      # Used for synchronization of pools access.
-      MUTEX = Mutex.new
-
       # @return [ Hash ] options The pool options.
       attr_reader :options
 
@@ -131,22 +128,10 @@ module Mongo
         #
         # @since 2.0.0
         def get(server)
-          MUTEX.synchronize do
-            pools[server.address] ||= create_pool(server)
-          end
-        end
-
-        private
-
-        def create_pool(server)
           ConnectionPool.new(server.options) do
             Connection.new(server, server.options)
           end
         end
-
-        def pools
-          @pools ||= {}
-        end
       end
     end
   end

data/lib/mongo/server/description.rb

@@ -364,7 +364,8 @@ module Mongo
       #
       # @since 2.0.0
       def other?
-        !primary? && !secondary? && !passive? && !arbiter?
+        (!primary? && !secondary? && !passive? && !arbiter?) ||
+          (hidden? && !replica_set_name.nil?)
       end
 
       # Will return true if the server is passive.

data/lib/mongo/version.rb

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

data/mongo.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |s|
   s.has_rdoc          = 'yard'
   s.bindir            = 'bin'
 
-  s.add_dependency 'bson', '~> 4.0.0.rc0'
+  s.add_dependency 'bson', '~> 4.0'
 end

data/spec/mongo/collection_spec.rb

@@ -521,7 +521,7 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the user is not authorized' do
+    context 'when the user is not authorized', if: auth_enabled? do
 
       let(:view) do
         unauthorized_collection.find

data/spec/mongo/database_spec.rb

@@ -180,7 +180,7 @@ describe Mongo::Database do
       end
     end
 
-    context 'when the user is not authorized', unless: sharded? do
+    context 'when the user is not authorized', if: auth_enabled? do
 
       let(:database) do
         described_class.new(unauthorized_client, TEST_DB)

data/spec/mongo/server/connection_pool_spec.rb

@@ -18,10 +18,14 @@ describe Mongo::Server::ConnectionPool do
     Mongo::Event::Listeners.new
   end
 
+  let(:cluster) do
+    double('cluster')
+  end
+
   describe '#checkin' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
+      Mongo::Server.new(address, cluster, monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -29,6 +33,7 @@ describe Mongo::Server::ConnectionPool do
     end
 
     after do
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
 
@@ -55,7 +60,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#checkout' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
+      Mongo::Server.new(address, cluster, monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -103,27 +108,24 @@ describe Mongo::Server::ConnectionPool do
   describe '#disconnect!' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
+      Mongo::Server.new(address, cluster, monitoring, listeners, options)
     end
 
     let!(:pool) do
       described_class.get(server)
     end
 
-    after do
-      server.disconnect!
-    end
-
     it 'disconnects the queue' do
-      expect(pool.send(:queue)).to receive(:disconnect!).twice.and_call_original
-      pool.disconnect!
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
+      expect(pool.send(:queue)).to receive(:disconnect!).once.and_call_original
+      server.disconnect!
     end
   end
 
   describe '.get' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
+      Mongo::Server.new(address, cluster, monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -131,18 +133,19 @@ describe Mongo::Server::ConnectionPool do
     end
 
     after do
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
 
     it 'returns the pool for the server' do
-      expect(pool).to eql(described_class.get(server))
+      expect(pool).to_not be_nil
     end
   end
 
   describe '#inspect' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
+      Mongo::Server.new(address, cluster, monitoring, listeners, options)
     end
 
     let!(:pool) do
@@ -150,6 +153,7 @@ describe Mongo::Server::ConnectionPool do
     end
 
     after do
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
 
@@ -165,7 +169,7 @@ describe Mongo::Server::ConnectionPool do
   describe '#with_connection' do
 
     let(:server) do
-      Mongo::Server.new(address, double('cluster'), monitoring, listeners, options)
+      Mongo::Server.new(address, cluster, monitoring, listeners, options)
     end
 
     let!(:pool) do

data/spec/mongo/server/connection_spec.rb

@@ -14,27 +14,26 @@ describe Mongo::Server::Connection do
     Mongo::Event::Listeners.new
   end
 
+  let(:cluster) do
+    double('cluster')
+  end
+
   let(:server) do
-    Mongo::Server.new(address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
+    Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
+  end
+
+  let(:pool) do
+    double('pool')
   end
 
   after do
+    expect(cluster).to receive(:pool).with(server).and_return(pool)
+    expect(pool).to receive(:disconnect!).and_return(true)
     server.disconnect!
   end
 
   describe '#connectable?' do
 
-    # context 'when the connection is connectable' do
-
-    #   let(:connection) do
-    #     described_class.new(server)
-    #   end
-
-    #   it 'returns true' do
-    #     expect(connection).to be_connectable
-    #   end
-    # end
-
     context 'when the connection is not connectable' do
 
       let(:bad_address) do
@@ -42,7 +41,7 @@ describe Mongo::Server::Connection do
       end
 
       let(:bad_server) do
-        Mongo::Server.new(bad_address, double('cluster'), monitoring, listeners, TEST_OPTIONS)
+        Mongo::Server.new(bad_address, cluster, monitoring, listeners, TEST_OPTIONS)
       end
 
       let(:connection) do
@@ -240,6 +239,55 @@ describe Mongo::Server::Connection do
       end
     end
 
+    context 'when the message exceeds the max size' do
+
+      context 'when the message is an insert' do
+
+        before do
+          allow(connection).to receive(:max_message_size).and_return(200)
+        end
+
+        let(:documents) do
+          [{ 'name' => 'testing' } ] * 10
+        end
+
+        let(:reply) do
+          connection.dispatch([ insert ])
+        end
+
+        it 'checks the size against the max message size' do
+          expect {
+            reply
+          }.to raise_exception(Mongo::Error::MaxMessageSize)
+        end
+      end
+
+      context 'when the message is a command' do
+
+        before do
+          allow(connection).to receive(:max_bson_object_size).and_return(100)
+        end
+
+        let(:selector) do
+          { :getlasterror => '1' }
+        end
+
+        let(:command) do
+          Mongo::Protocol::Query.new(TEST_DB, '$cmd', selector, :limit => -1)
+        end
+
+        let(:reply) do
+          connection.dispatch([ command ])
+        end
+
+        it 'checks the size against the max bson size' do
+          expect {
+            reply
+          }.to raise_exception(Mongo::Error::MaxBSONSize)
+        end
+      end
+    end
+
     context 'when a network or socket error occurs' do
 
       let(:socket) do

data/spec/mongo/server_spec.rb

@@ -18,6 +18,10 @@ describe Mongo::Server do
     Mongo::Address.new('127.0.0.1:27017')
   end
 
+  let(:pool) do
+    Mongo::Server::ConnectionPool.get(server)
+  end
+
   describe '#==' do
 
     let(:server) do
@@ -25,6 +29,7 @@ describe Mongo::Server do
     end
 
     after do
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
 
@@ -81,6 +86,10 @@ describe Mongo::Server do
         server.disconnect!
       end
 
+      before do
+        expect(cluster).to receive(:pool).with(server).and_return(pool)
+      end
+
       it 'returns true' do
         expect(server).to be_connectable
       end
@@ -97,6 +106,7 @@ describe Mongo::Server do
       end
 
       before do
+        expect(cluster).to receive(:pool).with(server).and_return(pool)
         server.disconnect!
       end
 
@@ -117,6 +127,7 @@ describe Mongo::Server do
     end
 
     after do
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
 
@@ -133,6 +144,7 @@ describe Mongo::Server do
 
     it 'stops the monitor instance' do
       expect(server.instance_variable_get(:@monitor)).to receive(:stop!).and_return(true)
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
   end
@@ -150,6 +162,7 @@ describe Mongo::Server do
     end
 
     after do
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
 
@@ -166,25 +179,6 @@ describe Mongo::Server do
     end
   end
 
-  describe '#pool' do
-
-    let(:server) do
-      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
-    end
-
-    let(:pool) do
-      server.pool
-    end
-
-    after do
-      server.disconnect!
-    end
-
-    it 'returns the connection pool for the server' do
-      expect(pool).to be_a(Mongo::Server::ConnectionPool)
-    end
-  end
-
   describe '#scan!' do
 
     let(:server) do
@@ -192,6 +186,7 @@ describe Mongo::Server do
     end
 
     after do
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
 
@@ -211,6 +206,7 @@ describe Mongo::Server do
     end
 
     after do
+      expect(cluster).to receive(:pool).with(server).and_return(pool)
       server.disconnect!
     end
 

data/spec/spec_helper.rb

@@ -171,6 +171,15 @@ def failing_delete_doc
                            { que: { field: 'test' } }
 end
 
+# Try running a command on the admin database to see if the mongod was started with auth.
+#
+# @since 2.2.0
+def auth_enabled?
+  $mongo_client ||= initialize_scanned_client!
+  begin; $mongo_client.use(:admin).command(getCmdLineOpts: 1); rescue; return true; end
+  false
+end
+
 # Initializes a basic scanned client to do an ismaster check.
 #
 # @since 2.0.0

data/spec/support/sdam/rs/rsother_discovered.yml

@@ -7,12 +7,21 @@ phases: [
     {
         responses: [
 
+                ["a:27017", {
+
+                    ok: 1,
+                    ismaster: false,
+                    secondary: true,
+                    hidden: true,
+                    hosts: ["c:27017", "d:27017"],
+                    setName: "rs"
+                }],
                 ["b:27017", {
 
                     ok: 1,
                     ismaster: false,
                     secondary: false,
-                    hosts: ["a:27017", "b:27017"],
+                    hosts: ["c:27017", "d:27017"],
                     setName: "rs"
                 }]
         ],
@@ -23,14 +32,26 @@ phases: [
 
                 "a:27017": {
 
-                    type: "Unknown",
-                    setName:
+                    type: "RSOther",
+                    setName: "rs"
                 },
 
                 "b:27017": {
 
                     type: "RSOther",
                     setName: "rs"
+                },
+
+                "c:27017": {
+
+                    type: "Unknown",
+                    setName: 
+                },
+
+                "d:27017": {
+
+                    type: "Unknown",
+                    setName: 
                 }
             },
 

data/spec/support/sdam/rs/stepdown_change_set_name.yml

@@ -0,0 +1,59 @@
+description: "Primary becomes a secondary with wrong setName"
+
+uri: "mongodb://a/?replicaSet=rs"
+
+phases: [
+
+    # Primary is discovered normally.
+    {
+        responses: [
+
+                ["a:27017", {
+
+                    ok: 1,
+                    ismaster: true,
+                    hosts: ["a:27017"],
+                    setName: "rs"
+                }]
+        ],
+
+        outcome: {
+
+            servers: {
+
+                "a:27017": {
+
+                    type: "RSPrimary",
+                    setName: "rs"
+                }
+            },
+
+            topologyType: "ReplicaSetWithPrimary",
+            setName: "rs"
+        }
+    },
+
+    # Primary changes its setName and becomes secondary.
+    # Remove it and change the topologyType.
+    {
+        responses: [
+
+                ["a:27017", {
+
+                    ok: 1,
+                    ismaster: false,
+                    secondary: true,
+                    hosts: ["a:27017"],
+                    setName: "wrong"
+                }]
+        ],
+
+        outcome: {
+
+            servers: {},
+
+            topologyType: "ReplicaSetNoPrimary",
+            setName: "rs"
+        }
+    }
+]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc0
+  version: 2.2.0
 platform: ruby
 authors:
 - Tyler Brock
@@ -14,7 +14,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
   ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE0MTEyMDE1NTYxOVoXDTE1MTEyMDE1NTYxOVowQjEUMBIGA1UEAwwL
+  Y29tMB4XDTE1MTIwNzE1MTcyNloXDTE2MTIwNjE1MTcyNlowQjEUMBIGA1UEAwwL
   ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
   ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
   bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
@@ -25,14 +25,14 @@ cert_chain:
   u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
   BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
   QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBAKjvumG2Fy9zAoSc1OEcmAqqOfzx1U+isGyEsz1rs5eT
-  HAIHsxaEdZTjSwDuqyelLDWJHWspeWU5pV5lepfI4cop29wwoPJIJ9Az2RMMbtdv
-  gFApVb6QX61OMenFeOdJ/QZ3n9xcrxJZFdvrXQ5GjEU2anq3dJhFeESwIMlfVJC7
-  7XrlMxizzH712DPfy65dMj0Y39qHdoWYKeCkEoj5UWNcHRK9xgaHJR6prlXrIhgb
-  o2UXDbWtz5PqoFd8EgNJAn3+BG1pwC9S9pVFG3WPucfAx/bE8iq/vvchHei5Y/Vo
-  aAz5f/hY4zFeYWvGDBHYEXE1rTN2hhMSyJscPcFbmz0=
+  KoZIhvcNAQEFBQADggEBAL/5shZXBvCGGJcJqXyD2CJieOOH4EGUt/UKvSZ58lMz
+  QkW5aKG22GJbXesMq+dMm/+gzUB2ea9TzttBEE5ZM/eNvoxyf7yNUcFyLQ365S6P
+  rtQOj1Ms7ud5ffrhZJn1o7ayfY2ljQU0xLI2Yoyzl9XJq8U0TztS6Vk5wYIoLwUX
+  NWGRSbETPJyR4mtUEbgI5A+N7pakJPUKKK1zXzADflsx51jjP5rZJJltnoVsBBgN
+  EhIn2f8suSc9QAqYt7w4T+PMtjxWTVcXs+Uy2PbDtjhtEBz6ZsP6YSsOpJbrCjCV
+  wZtXjpRUvWz86V5vjhHCTE8fqfEb85aeDwUCckPzpio=
   -----END CERTIFICATE-----
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -40,14 +40,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc0
+        version: '4.0'
 description: A Ruby driver for MongoDB
 email: mongodb-dev@googlegroups.com
 executables: []
@@ -59,7 +59,6 @@ files:
 - README.md
 - Rakefile
 - bin/mongo_console
-- lib/csasl/csasl.bundle
 - lib/mongo.rb
 - lib/mongo/address.rb
 - lib/mongo/address/ipv4.rb
@@ -493,6 +492,7 @@ files:
 - spec/support/sdam/rs/secondary_mismatched_me.yml
 - spec/support/sdam/rs/secondary_wrong_set_name.yml
 - spec/support/sdam/rs/secondary_wrong_set_name_with_primary.yml
+- spec/support/sdam/rs/stepdown_change_set_name.yml
 - spec/support/sdam/rs/unexpected_mongos.yml
 - spec/support/sdam/rs/wrong_set_name.yml
 - spec/support/sdam/sharded/mongos_disconnect.yml
@@ -563,12 +563,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB
@@ -774,6 +774,7 @@ test_files:
 - spec/support/sdam/rs/secondary_mismatched_me.yml
 - spec/support/sdam/rs/secondary_wrong_set_name.yml
 - spec/support/sdam/rs/secondary_wrong_set_name_with_primary.yml
+- spec/support/sdam/rs/stepdown_change_set_name.yml
 - spec/support/sdam/rs/unexpected_mongos.yml
 - spec/support/sdam/rs/wrong_set_name.yml
 - spec/support/sdam/sharded/mongos_disconnect.yml