mongo 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 009aca6194505e854c2e8ce72b50826c76b81942
-  data.tar.gz: ec9fa507bafe9c3f79ce430bee77bee9fa6452c3
+  metadata.gz: 391a49fc68da96ed3daf59dae9e7006edd6eb7c4
+  data.tar.gz: c9b0c470d42785c446fa2c2ae21273bd45f487ea
 SHA512:
-  metadata.gz: ac666b6d3593018bf29f22a212bcf36a1b0dff88e9aee3e439c3f599bff14c90b8e2507355b10cc40e4426a7135313fa161d78fdc853ac4c094acfa9122d2c2c
-  data.tar.gz: 0ff89ae3bc0661a5a39e067a0c96d7a044b291333f314dd6dbd89e8bb7c6d2f4f95ba894785d784acc8126f66896b0505900d56b39c77c5e1a4ac66f8f43f0ca
+  metadata.gz: b77002840a210f7bf8c98114529edd2d0a8891dc6518fcd3c3d1337b2648cf2b31b9d3564aab8ab404521232713a452986cfd6202bdaa69c06fde024305befbe
+  data.tar.gz: 146937702a43742e5e678845431b61b071c6b3573084dac4f7cb196f3ec601c97d78a248c39c1066a5fd7860f6195a72837210f6b8bdd84b7b6ed03328063f24

data/lib/mongo/auth/cr/conversation.rb

@@ -102,7 +102,6 @@ module Mongo
         #   Conversation.new(user, "admin")
         #
         # @param [ Auth::User ] user The user to converse about.
-        # @param [ String ] database The database to authenticate against.
         #
         # @since 2.0.0
         def initialize(user)

data/lib/mongo/client.rb

@@ -21,6 +21,12 @@ module Mongo
   class Client
     extend Forwardable
 
+    # The options that do not affect the behaviour of a cluster and its
+    # subcomponents.
+    #
+    # @since 2.1.0
+    CRUD_OPTIONS = [ :database, :read, :write ].freeze
+
     # @return [ Mongo::Cluster ] cluster The cluster of servers for the client.
     attr_reader :cluster
 
@@ -203,8 +209,9 @@ module Mongo
       clone.tap do |client|
         client.options.update(new_options)
         Database.create(client)
-        # We can't use the same cluster if authentication details have changed.
-        if new_options[:user] || new_options[:password]
+        # We can't use the same cluster if some options that would affect it
+        # have changed.
+        if cluster_modifying?(new_options)
           Cluster.create(client)
         end
       end
@@ -244,9 +251,7 @@ module Mongo
     #
     # @since 2.0.5
     def list_databases
-      use(Database::ADMIN).command(
-        listDatabases: 1
-      ).first['databases']
+      use(Database::ADMIN).command(listDatabases: 1).first['databases']
     end
 
     private
@@ -270,5 +275,14 @@ module Mongo
       @read_preference = nil
       @write_concern = nil
     end
+
+    def cluster_modifying?(new_options)
+      cluster_options = new_options.reject do |name|
+        CRUD_OPTIONS.include?(name)
+      end
+      cluster_options.any? do |name, value|
+        options[name] != value
+      end
+    end
   end
 end

data/lib/mongo/cluster.rb

@@ -25,9 +25,6 @@ module Mongo
     include Event::Subscriber
     include Loggable
 
-    # @return [ Array<String> ] The provided seed addresses.
-    attr_reader :addresses
-
     # @return [ Hash ] The options hash.
     attr_reader :options
 
@@ -69,10 +66,9 @@ module Mongo
       if !addresses.include?(address)
         if addition_allowed?(address)
           log_debug([ "Adding #{address.to_s} to the cluster." ])
-          addresses.push(address)
-          server = Server.new(address, event_listeners,
-                              options.merge(slave_ok: @slave_ok))
-          @servers.push(server)
+          @update_lock.synchronize { @addresses.push(address) }
+          server = Server.new(address, self, event_listeners, options)
+          @update_lock.synchronize { @servers.push(server) }
           server
         end
       end
@@ -93,10 +89,10 @@ module Mongo
       @event_listeners = Event::Listeners.new
       @options = options.freeze
       @topology = Topology.initial(seeds, options)
-      @slave_ok = @topology.single? unless options[:read]
+      @update_lock = Mutex.new
 
-      subscribe_to(Event::SERVER_ADDED, Event::ServerAdded.new(self))
-      subscribe_to(Event::SERVER_REMOVED, Event::ServerRemoved.new(self))
+      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) }
@@ -138,10 +134,23 @@ module Mongo
     #
     # @since 2.0.0
     def elect_primary!(description)
-      @topology = topology.elect_primary(description, @servers)
+      @topology = topology.elect_primary(description, servers_list)
     end
 
-    # Removed the server from the cluster for the provided address, if it
+    # Notify the cluster that a standalone server was discovered so that the
+    # topology can be updated accordingly.
+    #
+    # @example Notify the cluster that a standalone server was discovered.
+    #   cluster.standalone_discovered
+    #
+    # @return [ Topology ] The cluster topology.
+    #
+    # @since 2.0.6
+    def standalone_discovered
+      @topology = topology.standalone_discovered
+    end
+
+    # Remove the server from the cluster for the provided address, if it
     # exists.
     #
     # @example Remove the server from the cluster.
@@ -153,9 +162,10 @@ module Mongo
     def remove(host)
       log_debug([ "#{host} being removed from the cluster." ])
       address = Address.new(host)
-      removed_servers = @servers.reject!{ |server| server.address == address }
+      removed_servers = @servers.select { |s| s.address == address }
+      @update_lock.synchronize { @servers = @servers - removed_servers }
       removed_servers.each{ |server| server.disconnect! } if removed_servers
-      addresses.reject!{ |addr| addr == address }
+      @update_lock.synchronize { @addresses.reject! { |addr| addr == address } }
     end
 
     # Force a scan of all known servers in the cluster.
@@ -170,7 +180,7 @@ module Mongo
     #
     # @since 2.0.0
     def scan!
-      @servers.each{ |server| server.scan! } and true
+      servers_list.each{ |server| server.scan! } and true
     end
 
     # Get a list of server candidates from the cluster that can have operations
@@ -183,7 +193,37 @@ module Mongo
     #
     # @since 2.0.0
     def servers
-      topology.servers(@servers.compact).compact
+      topology.servers(servers_list.compact).compact
+    end
+
+    # Add hosts in a description to the cluster.
+    #
+    # @example Add hosts in a description to the cluster.
+    #   cluster.add_hosts(description)
+    #
+    # @param [ Mongo::Server::Description ] description The description.
+    #
+    # @since 2.0.6
+    def add_hosts(description)
+      if topology.add_hosts?(description, servers_list)
+        description.servers.each { |s| add(s) }
+      end
+    end
+
+    # Remove hosts in a description from the cluster.
+    #
+    # @example Remove hosts in a description from the cluster.
+    #   cluster.remove_hosts(description)
+    #
+    # @param [ Mongo::Server::Description ] description The description.
+    #
+    # @since 2.0.6
+    def remove_hosts(description)
+      if topology.remove_hosts?(description)
+        servers_list.each do |s|
+          remove(s.address.to_s) if topology.remove_server?(description, s)
+        end
+      end
     end
 
     # Create a cluster for the provided client, for use when we don't want the
@@ -204,6 +244,18 @@ module Mongo
       client.instance_variable_set(:@cluster, cluster)
     end
 
+    # The addresses in the cluster.
+    #
+    # @example Get the addresses in the cluster.
+    #   cluster.addresses
+    #
+    # @return [ Array<Mongo::Address> ] The addresses.
+    #
+    # @since 2.0.6
+    def addresses
+      addresses_list
+    end
+
     private
 
     def direct_connection?(address)
@@ -213,5 +265,21 @@ module Mongo
     def addition_allowed?(address)
       !@topology.single? || direct_connection?(address)
     end
+
+    def servers_list
+      @update_lock.synchronize do
+        @servers.reduce([]) do |servers, server|
+          servers << server
+        end
+      end
+    end
+
+    def addresses_list
+      @update_lock.synchronize do
+        @addresses.reduce([]) do |addresses, address|
+          addresses << address
+        end
+      end
+    end
   end
 end

data/lib/mongo/cluster/topology.rb

@@ -48,12 +48,11 @@ module Mongo
       # @since 2.0.0
       def initial(seeds, options)
         if options.has_key?(:connect)
-          return OPTIONS.fetch(options[:connect]).new(options, seeds)
-        end
-        if options.has_key?(:replica_set)
+          OPTIONS.fetch(options[:connect]).new(options, seeds)
+        elsif options.has_key?(:replica_set)
           ReplicaSet.new(options, seeds)
         else
-          seeds.size > 1 ? Unknown.new(options, seeds) : Single.new(options, seeds)
+          Unknown.new(options, seeds)
         end
       end
     end

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

@@ -125,6 +125,54 @@ module Mongo
           end
         end
 
+        # Whether a server description's hosts may be added to the cluster.
+        #
+        # @example Check if a description's hosts may be added to the cluster.
+        #   topology.add_hosts?(description, servers)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        # @param [ Array<Mongo::Server> ] servers The cluster servers.
+        #
+        # @return [ true, false ] Whether a description's hosts may be added.
+        #
+        # @since 2.0.6
+        def add_hosts?(description, servers)
+          !!(member_of_this_set?(description) && !has_primary?(servers))
+        end
+
+        # Whether a description can be used to remove hosts from the cluster.
+        #
+        # @example Check if a description can be used to remove hosts from the cluster.
+        #   topology.remove_hosts?(description)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        #
+        # @return [ true, false ] Whether hosts may be removed from the cluster.
+        #
+        # @since 2.0.6
+        def remove_hosts?(description)
+          !description.config.empty? &&
+            (description.primary? ||
+              description.hosts.empty? ||
+                !member_of_this_set?(description))
+        end
+
+        # Whether a specific server in the cluster can be removed, given a description.
+        #
+        # @example Check if a specific server can be removed from the cluster.
+        #   topology.remove_server?(description, server)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        # @param [ Mongo::Serve ] server The server in question.
+        #
+        # @return [ true, false ] Whether the server can be removed from the cluster.
+        #
+        # @since 2.0.6
+        def remove_server?(description, server)
+          remove_self?(description, server) ||
+            (member_of_this_set?(description) && !description.lists_server?(server))
+        end
+
         # A replica set topology is not sharded.
         #
         # @example Is the topology sharded?
@@ -154,6 +202,33 @@ module Mongo
         #
         # @since 2.0.0
         def unknown?; false; end
+
+        # Notify the topology that a standalone was discovered.
+        #
+        # @example Notify the topology that a standalone was discovered.
+        #   topology.standalone_discovered
+        #
+        # @return [ Topology::ReplicaSet ] Always returns self.
+        #
+        # @since 2.0.6
+        def standalone_discovered; self; end
+
+        private
+
+        def has_primary?(servers)
+          servers.find { |s| s.primary? }
+        end
+
+        def member_of_this_set?(description)
+          description.replica_set_member? &&
+            description.replica_set_name == replica_set_name
+        end
+
+        def remove_self?(description, server)
+          !member_of_this_set?(description) &&
+            description.is_server?(server) &&
+              !description.ghost?
+        end
       end
     end
   end

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

@@ -97,6 +97,50 @@ module Mongo
           servers.select{ |server| server.mongos? }
         end
 
+        # Whether a server description's hosts may be added to the cluster.
+        #
+        # @example Check if a description's hosts may be added to the cluster.
+        #   topology.add_hosts?(description, servers)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        # @param [ Array<Mongo::Server> ] servers The cluster servers.
+        #
+        # @return [ false ] A description's hosts are never added to a
+        #   sharded cluster.
+        #
+        # @since 2.0.6
+        def add_hosts?(description, servers); false; end
+
+        # Whether a description can be used to remove hosts from the cluster.
+        #
+        # @example Check if a description can be used to remove hosts from
+        # the cluster.
+        #   topology.remove_hosts?(description)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        #
+        # @return [ true ] A description can always be used to remove hosts
+        #   from a sharded cluster.
+        #
+        # @since 2.0.6
+        def remove_hosts?(description); true; end
+
+        # Whether a specific server in the cluster can be removed, given a description.
+        #
+        # @example Check if a specific server can be removed from the cluster.
+        #   topology.remove_server?(description, server)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        # @param [ Mongo::Serve ] server The server in question.
+        #
+        # @return [ true, false ] Whether the server can be removed from the cluster.
+        #
+        # @since 2.0.6
+        def remove_server?(description, server)
+          remove_self?(description, server) ||
+            !(server.mongos? || server.unknown?)
+        end
+
         # A sharded topology is sharded.
         #
         # @example Is the topology sharded?
@@ -126,6 +170,22 @@ module Mongo
         #
         # @since 2.0.0
         def unknown?; false; end
+
+        # Notify the topology that a standalone was discovered.
+        #
+        # @example Notify the topology that a standalone was discovered.
+        #   topology.standalone_discovered
+        #
+        # @return [ Topology::Sharded ] Always returns self.
+        #
+        # @since 2.0.6
+        def standalone_discovered; self; end
+
+        private
+
+        def remove_self?(description, server)
+          description.is_server?(server) && !description.mongos?
+        end
       end
     end
   end

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

@@ -101,6 +101,47 @@ module Mongo
           [ servers.detect { |server| !server.unknown? } ]
         end
 
+        # Whether a server description's hosts may be added to the cluster.
+        #
+        # @example Check if a description's hosts may be added to the cluster.
+        #   topology.add_hosts?(description, servers)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        # @param [ Array<Mongo::Server> ] servers The cluster servers.
+        #
+        # @return [ false ] A description's hosts are never added to a
+        #   cluster of Single topology.
+        #
+        # @since 2.0.6
+        def add_hosts?(description, servers); false; end
+
+        # Whether a description can be used to remove hosts from the cluster.
+        #
+        # @example Check if a description can be used to remove hosts from
+        # the cluster.
+        #   topology.remove_hosts?(description)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        #
+        # @return [ true ] A description can never be used to remove hosts
+        #   from a cluster of Single topology.
+        #
+        # @since 2.0.6
+        def remove_hosts?(description); false; end
+
+        # Whether a specific server in the cluster can be removed, given a description.
+        #
+        # @example Check if a specific server can be removed from the cluster.
+        #   topology.remove_server?(description, server)
+        #
+        # @param [ Mongo::Server::Description ] description The description.
+        # @param [ Mongo::Serve ] server The server in question.
+        #
+        # @return [ false ] A server is never removed from a cluster of Single topology.
+        #
+        # @since 2.0.6
+        def remove_server?(description, server); false; end
+
         # A single topology is not sharded.
         #
         # @example Is the topology sharded?
@@ -130,6 +171,16 @@ module Mongo
         #
         # @since 2.0.0
         def unknown?; false; end
+
+        # Notify the topology that a standalone was discovered.
+        #
+        # @example Notify the topology that a standalone was discovered.
+        #   topology.standalone_discovered
+        #
+        # @return [ Topology::Single ] Always returns self.
+        #
+        # @since 2.0.6
+        def standalone_discovered; self; end
       end
     end
   end