mongo 1.8.0 → 1.8.2

data/lib/mongo/mongo_replica_set_client.rb

@@ -20,16 +20,14 @@ module Mongo
 
   # Instantiates and manages connections to a MongoDB replica set.
   class MongoReplicaSetClient < MongoClient
+    include ThreadLocalVariableManager
 
     REPL_SET_OPTS = [
-      :read,
       :refresh_mode,
       :refresh_interval,
       :read_secondary,
       :rs_name,
-      :name,
-      :tag_sets,
-      :secondary_acceptable_latency_ms
+      :name
     ]
 
     attr_reader :replica_set_name,
@@ -37,9 +35,7 @@ module Mongo
                 :refresh_interval,
                 :refresh_mode,
                 :refresh_version,
-                :manager,
-                :tag_sets,
-                :acceptable_latency
+                :manager
 
     # Create a connection to a MongoDB replica set.
     #
@@ -53,11 +49,17 @@ module Mongo
     # @overload initialize(seeds=ENV["MONGODB_URI"], opts={})
     #   @param [Array<String>, Array<Array(String, Integer)>] seeds
     #
-    #   @option opts [Hash] :w (1), :j (false), :wtimeout (false), :fsync (false) Set the default write concern
-    #     propagated to DB objects instantiated off of this MongoReplicaSetClient. This
-    #     default can be overridden upon instantiation of any DB by explicitly setting write concern values
-    #     on initialization.
-    #   @option opts [:primary, :primary_preferred, :secondary, :secondary_preferred, :nearest] :read_preference (:primary)
+    #   @option opts [String, Integer, Symbol] :w (1) Set default number of nodes to which a write
+    #     should be acknowledged
+    #   @option opts [Boolean] :j (false) Set journal acknowledgement
+    #   @option opts [Integer] :wtimeout (nil) Set acknowledgement timeout
+    #   @option opts [Boolean] :fsync (false) Set fsync acknowledgement.
+    #
+    #     Notes about write concern options:
+    #       Write concern options are propagated to objects instantiated from this MongoReplicaSetClient.
+    #       These defaults can be overridden upon instantiation of any object by explicitly setting an options hash
+    #       on initialization.
+    #   @option opts [:primary, :primary_preferred, :secondary, :secondary_preferred, :nearest] :read (:primary)
     #     A "read preference" determines the candidate replica set members to which a query or command can be sent.
     #     [:primary]
     #       * Read from primary only.
@@ -109,34 +111,38 @@ module Mongo
     # @raise [ConnectionFailure] This is raised for the various connection failures.
     def initialize(*args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
-      nodes = args
-      nodes = nodes.flatten(1) if nodes.first.is_a?(Array) && nodes.first.first.is_a?(Array)
+      nodes = args.shift || []
+
+      raise MongoArgumentError, "Too many arguments" unless args.empty?
+
+      # This is temporary until support for the old format is dropped
+      @seeds = nodes.collect do |node|
+        if node.is_a?(Array)
+          warn "Initiating a MongoReplicaSetClient with seeds passed as individual [host, port] array arguments is deprecated."
+          warn "Please specify hosts as an array of 'host:port' strings; the old format will be removed in v2.0"
+          node
+        elsif node.is_a?(String)
+          host, port = node.split(":")
+          [ host, port.to_i ]
+        else
+          raise MongoArgumentError "Bad seed format!"
+        end
+      end
 
-      if nodes.empty? and ENV.has_key?('MONGODB_URI')
+      if @seeds.empty? && ENV.has_key?('MONGODB_URI')
         parser = URIParser.new ENV['MONGODB_URI']
         if parser.direct?
-          raise MongoArgumentError, "Mongo::MongoReplicaSetClient.new called with no arguments, but ENV['MONGODB_URI'] implies a direct connection."
+          raise MongoArgumentError,
+            "ENV['MONGODB_URI'] implies a direct connection."
         end
         opts = parser.connection_options.merge! opts
-        nodes = [parser.nodes]
+        @seeds = parser.nodes
       end
 
-      unless nodes.length > 0
+      if @seeds.length.zero?
         raise MongoArgumentError, "A MongoReplicaSetClient requires at least one seed node."
       end
 
-      # This is temporary until support for the old format is dropped
-      if nodes.first.last.is_a?(Integer)
-        warn "Initiating a MongoReplicaSetClient with seeds passed as individual [host, port] array arguments is deprecated."
-        warn "Please specify hosts as an array of 'host:port' strings; the old format will be removed in v2.0"
-        @seeds = nodes
-      else
-        @seeds = nodes.first.map do |host_port|
-          host, port = host_port.split(":")
-          [ host, port.to_i ]
-        end
-      end
-
       @seeds.freeze
 
       # Refresh
@@ -159,8 +165,10 @@ module Mongo
       @connect_mutex = Mutex.new
       @refresh_mutex = Mutex.new
 
+      @mongos = false
+
       check_opts(opts)
-      setup(opts)
+      setup(opts.dup)
     end
 
     def valid_opts
@@ -181,8 +189,7 @@ module Mongo
         seeds = @manager.nil? ? @seeds : @manager.seeds
         @manager = PoolManager.new(self, seeds)
 
-        Thread.current[:managers] ||= Hash.new
-        Thread.current[:managers][self] = @manager
+        thread_local[:managers][self] = @manager
 
         @manager.connect
         @refresh_version += 1
@@ -232,7 +239,7 @@ module Mongo
       new_manager = PoolManager.new(self, discovered_seeds | @seeds)
       new_manager.connect
 
-      Thread.current[:managers][self] = new_manager
+      thread_local[:managers][self] = new_manager
 
       # TODO: make sure that connect has succeeded
       @old_managers << @manager
@@ -279,11 +286,6 @@ module Mongo
     def read_primary?
       @manager.read_pool == @manager.primary_pool
     end
-    alias :primary? :read_primary?
-
-    def read_preference
-      @read
-    end
 
     # Close the connection to the database.
     def close(opts={})
@@ -294,9 +296,7 @@ module Mongo
       end
 
       # Clear the reference to this object.
-      if Thread.current[:managers]
-        Thread.current[:managers].delete(self)
-      end
+      thread_local[:managers].delete(self)
 
       @connected = false
     end
@@ -374,19 +374,15 @@ module Mongo
     end
 
     def ensure_manager
-      Thread.current[:managers] ||= Hash.new
-
-      if Thread.current[:managers][self] != @manager
-        Thread.current[:managers][self] = @manager
-      end
+      thread_local[:managers][self] = @manager
     end
 
     def pin_pool(pool)
-      @manager.pinned_pools[Thread.current] = pool if @manager
+      thread_local[:pinned_pools][@manager.object_id] = pool if @manager
     end
 
     def unpin_pool(pool)
-      @manager.pinned_pools[Thread.current] = nil if @manager
+      thread_local[:pinned_pools].delete @manager.object_id if @manager
     end
 
     def get_socket_from_pool(pool)
@@ -398,7 +394,7 @@ module Mongo
     end
 
     def local_manager
-      Thread.current[:managers][self] if Thread.current[:managers]
+      thread_local[:managers][self]
     end
 
     def arbiters
@@ -466,20 +462,12 @@ module Mongo
           "Refresh mode must be either :sync or false."
       end
 
-      # Determine read preference
       if opts[:read_secondary]
         warn ":read_secondary options has now been deprecated and will " +
           "be removed in driver v2.0. Use the :read option instead."
         @read_secondary = opts.delete(:read_secondary) || false
-        @read = :secondary_preferred
-      else
-        @read = opts.delete(:read) || :primary
-        Mongo::Support.validate_read_preference(@read)
       end
 
-      @tag_sets = opts.delete(:tag_sets) || []
-      @acceptable_latency = opts.delete(:secondary_acceptable_latency_ms) || 15
-
       # Replica set name
       if opts[:rs_name]
         warn ":rs_name option has been deprecated and will be removed in v2.0. " +
@@ -489,8 +477,6 @@ module Mongo
         @replica_set_name = opts.delete(:name)
       end
 
-      opts[:connect_timeout] = opts.delete(:connect_timeout) || 30
-
       super opts
     end
 

data/lib/mongo/mongo_sharded_client.rb

@@ -20,49 +20,13 @@ module Mongo
 
   # Instantiates and manages connections to a MongoDB sharded cluster for high availability.
   class MongoShardedClient < MongoReplicaSetClient
+    include ThreadLocalVariableManager
 
-    SHARDED_CLUSTER_OPTS = [:refresh_mode, :refresh_interval]
+    SHARDED_CLUSTER_OPTS = [:refresh_mode, :refresh_interval, :tag_sets, :read]
 
     attr_reader :seeds, :refresh_interval, :refresh_mode,
                 :refresh_version, :manager
 
-    # Create a connection to a MongoDB sharded cluster.
-    #
-    # If no args are provided, it will check <code>ENV["MONGODB_URI"]</code>.
-    #
-    # @param [Array] seeds "host:port" strings
-    #
-    # @option opts [String] :name (nil) The name of the sharded cluster to connect to. You
-    #   can use this option to verify that you're connecting to the right sharded cluster.
-    # @option opts [Hash] ::w (1), :j (false), :wtimeout (false), :fsync (false) Set the default write concern
-    #   propagated to DB objects instantiated off of this MongoClient. This
-    #   default can be overridden upon instantiation of any DB by explicitly setting a write concern values
-    #   on initialization.
-    # @option opts [Logger] :logger (nil) Logger instance to receive driver operation log.
-    # @option opts [Integer] :pool_size (1) The maximum number of socket connections allowed per
-    #   connection pool. Note: this setting is relevant only for multi-threaded applications.
-    # @option opts [Float] :pool_timeout (5.0) When all of the connections a pool are checked out,
-    #   this is the number of seconds to wait for a new connection to be released before throwing an exception.
-    #   Note: this setting is relevant only for multi-threaded applications.
-    # @option opts [Float] :op_timeout (nil) The number of seconds to wait for a read operation to time out.
-    # @option opts [Float] :connect_timeout (30) The number of seconds to wait before timing out a
-    #   connection attempt.
-    # @option opts [Boolean] :ssl (false) If true, create the connection to the server using SSL.
-    # @option opts [Boolean] :refresh_mode (false) Set this to :sync to periodically update the
-    #   state of the connection every :refresh_interval seconds. Sharded cluster connection failures
-    #   will always trigger a complete refresh. This option is useful when you want to add new nodes
-    #   or remove sharded cluster nodes not currently in use by the driver.
-    # @option opts [Integer] :refresh_interval (90) If :refresh_mode is enabled, this is the number of seconds
-    #   between calls to check the sharded cluster's state.
-    # Note: that the number of seed nodes does not have to be equal to the number of sharded cluster members.
-    # The purpose of seed nodes is to permit the driver to find at least one sharded cluster member even if a member is down.
-    #
-    # @example Connect to a sharded cluster and provide two seed nodes.
-    #   MongoShardedClient.new(['localhost:30000', 'localhost:30001'])
-    #
-    # @raise [MongoArgumentError] This is raised for usage errors.
-    #
-    # @raise [ConnectionFailure] This is raised for the various connection failures.
     def initialize(*args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
 
@@ -109,6 +73,8 @@ module Mongo
       @connect_mutex = Mutex.new
       @refresh_mutex = Mutex.new
 
+      @mongos        = true
+
       check_opts(opts)
       setup(opts)
     end
@@ -131,8 +97,7 @@ module Mongo
         @old_managers << @manager if @manager
         @manager = ShardingPoolManager.new(self, discovered_seeds | @seeds)
 
-        Thread.current[:managers] ||= Hash.new
-        Thread.current[:managers][self] = @manager
+        thread_local[:managers][self] = @manager
 
         @manager.connect
         @refresh_version += 1
@@ -191,31 +156,5 @@ module Mongo
         end
       end
     end
-
-    private
-
-    # Parse option hash
-    def setup(opts)
-      # Refresh
-      @refresh_mode = opts.fetch(:refresh_mode, false)
-      @refresh_interval = opts.fetch(:refresh_interval, 90)
-
-      if @refresh_mode && @refresh_interval < 60
-        @refresh_interval = 60 unless ENV['TEST_MODE'] = 'TRUE'
-      end
-
-      if @refresh_mode == :async
-        warn ":async refresh mode has been deprecated. Refresh
-        mode will be disabled."
-      elsif ![:sync, false].include?(@refresh_mode)
-        raise MongoArgumentError,
-          "Refresh mode must be either :sync or false."
-      end
-
-      opts[:connect_timeout] = opts[:connect_timeout] || 30
-
-      super opts
-    end
-
   end
 end

data/lib/mongo/networking.rb

@@ -28,7 +28,7 @@ module Mongo
 
       sock = opts.fetch(:socket, nil)
       begin
-        if operation == Mongo::Constants::OP_KILL_CURSORS && read_preference != :primary
+        if operation == Mongo::Constants::OP_KILL_CURSORS && @read != :primary
           sock ||= checkout_reader
         else
           sock ||= checkout_writer
@@ -229,6 +229,7 @@ module Mongo
         gle.merge!(write_concern)
         gle.delete(:w) if gle[:w] == 1
       end
+      gle[:w] = gle[:w].to_s if gle[:w].is_a?(Symbol)
       build_command_message(db_name, gle)
     end
 

data/lib/mongo/util/node.rb

@@ -1,7 +1,7 @@
 module Mongo
   class Node
 
-    attr_accessor :host, :port, :address, :config, :client, :socket, :last_state
+    attr_accessor :host, :port, :address, :client, :socket, :last_state
 
     def initialize(client, host_port)
       @client = client
@@ -9,6 +9,7 @@ module Mongo
       @address = "#{@host}:#{@port}"
       @config = nil
       @socket = nil
+      @node_mutex = Mutex.new
     end
 
     def eql?(other)
@@ -20,6 +21,12 @@ module Mongo
       address
     end
 
+    def config
+      connect unless connected?
+      set_config unless @config
+      @config
+    end
+
     def inspect
       "<Mongo::Node:0x#{self.object_id.to_s(16)} @host=#{@host} @port=#{@port}>"
     end
@@ -28,18 +35,19 @@ module Mongo
     # and, if successful, return the socket. Otherwise,
     # return nil.
     def connect
-      begin
-        socket = @client.socket_class.new(@host, @port, 
-          @client.op_timeout, @client.connect_timeout
-        )
-      rescue OperationTimeout, ConnectionFailure, OperationFailure, SocketError, SystemCallError, IOError => ex
-        @client.log(:debug, "Failed connection to #{host_string} with #{ex.class}, #{ex.message}.")
-        socket.close if socket
+      @node_mutex.synchronize do
+        begin
+          @socket = @client.socket_class.new(@host, @port,
+            @client.op_timeout, @client.connect_timeout
+          )
+        rescue OperationTimeout, ConnectionFailure, OperationFailure, SocketError, SystemCallError, IOError => ex
+          @client.log(:debug, "Failed connection to #{host_string} with #{ex.class}, #{ex.message}.")
+          close
+        end
       end
-
-      @socket = socket
     end
 
+    # This should only be called within a mutex
     def close
       if @socket && !@socket.closed?
         @socket.close
@@ -65,43 +73,38 @@ module Mongo
     # ismaster command. Additionally, check that the replica set name
     # matches with the name provided.
     def set_config
-      begin
-        @config = @client['admin'].command({:ismaster => 1}, :socket => @socket)
-
-        if @config['msg']
-          @client.log(:warn, "#{config['msg']}")
+      @node_mutex.synchronize do
+        begin
+          @config = @client['admin'].command({:ismaster => 1}, :socket => @socket)
+
+          if @config['msg']
+            @client.log(:warn, "#{config['msg']}")
+          end
+
+          unless @client.mongos?
+            check_set_membership(@config)
+            check_set_name(@config)
+          end
+        rescue ConnectionFailure, OperationFailure, OperationTimeout, SocketError, SystemCallError, IOError => ex
+          @client.log(:warn, "Attempted connection to node #{host_string} raised " +
+                              "#{ex.class}: #{ex.message}")
+          # Socket may already be nil from issuing command
+          close
         end
-
-        check_set_membership(config)
-        check_set_name(config)
-      rescue ConnectionFailure, OperationFailure, OperationTimeout, SocketError, SystemCallError, IOError => ex
-        @client.log(:warn, "Attempted connection to node #{host_string} raised " +
-                            "#{ex.class}: #{ex.message}")
-
-        # Socket may already be nil from issuing command
-        close
       end
-
-      @config
     end
 
     # Return a list of replica set nodes from the config.
     # Note: this excludes arbiters.
     def node_list
-      connect unless connected?
-      set_config unless @config
-
-      return [] unless config
-
       nodes = []
       nodes += config['hosts'] if config['hosts']
       nodes += config['passives'] if config['passives']
+      nodes += ["#{@host}:#{@port}"] if @client.mongos?
       nodes
     end
 
     def arbiters
-      connect unless connected?
-      set_config unless @config
       return [] unless config['arbiters']
 
       config['arbiters'].map do |arbiter|
@@ -110,15 +113,15 @@ module Mongo
     end
 
     def primary?
-      @config['ismaster'] == true || @config['ismaster'] == 1
+      config['ismaster'] == true || config['ismaster'] == 1
     end
 
     def secondary?
-      @config['secondary'] == true || @config['secondary'] == 1
+      config['secondary'] == true || config['secondary'] == 1
     end
 
     def tags
-      @config['tags'] || {}
+      config['tags'] || {}
     end
 
     def host_port
@@ -130,14 +133,10 @@ module Mongo
     end
 
     def healthy?
-      if @config.has_key?('secondary')
-        @config['ismaster'] || @config['secondary']
-      else
-        true
-      end
+      connected? && config
     end
 
-    private
+    protected
 
     def split_node(host_port)
       if host_port.is_a?(String)