mongo 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8b721f436d16c55388789c19bd0c03b99812702
-  data.tar.gz: b43de3ec9c986727abd9d4bf181e038ce3ddbe02
+  metadata.gz: 5bdb78ad2291ea3ecb387526ccdbd162ffd51687
+  data.tar.gz: 6b3ec42fadc3f0beea953a08fe07a2d2ff206cba
 SHA512:
-  metadata.gz: d0c55e5a9968be883c92acb53676b6ae8d08a77578dbaaec4cca2d71bf1c535d981d63f4f1377712819bae39733f6bde8781f8af860f5469e172bf4c2a14acb6
-  data.tar.gz: 241ccee8c30eadb597252c4fea0a599b920551c4f77dea15fbf747eea2abf7e0270788f496d6df657f8d88cb98728fae20a956977a285086c7f25a161bc8c89b
+  metadata.gz: 83bb86f711779590a47d0d8d83fea4d844cd8ebdcde6617109c9172dd9d6961688d3faf03c1c7d0c0601575ed1a253522aecc2b26f2e81fb7980079ca3dff9fd
+  data.tar.gz: 880a70826f29e9e60fff3d26ede30390da593e78ad095f635743ffec711ce22af34da2d89318fd48f7825e2583bbec02da80c78899d4388386a76c769ee1e80e

data/Rakefile

@@ -8,10 +8,10 @@ rescue LoadError
   raise '[FAIL] Bundler not found! Install it with `gem install bundler; bundle install`.'
 end
 
-if ENV['TEST']
+if ENV.has_key?('TEST') || ENV.has_key?('TRAVIS_TEST')
   Bundler.require(:default, :testing)
 else
-  Bundler.require(:default, :deploy, :testing)
+  Bundler.require(:default, :testing, :deploy, :development)
 end
 
 Dir.glob(File.join('tasks', '**', '*.rake')).sort.each { |rake| load File.expand_path(rake) }

data/VERSION

@@ -1 +1 @@
-1.8.5
+1.8.6

data/lib/mongo/db.rb

@@ -192,7 +192,12 @@ module Mongo
       user  = users.find_one({:user => username}) || {:user => username}
       user['pwd'] = Mongo::Support.hash_password(username, password)
       user['readOnly'] = true if read_only;
-      users.save(user)
+      begin
+        users.save(user)
+      rescue OperationFailure => ex
+        # adding first admin user fails GLE in MongoDB 2.2
+        raise ex unless ex.message =~ /login/
+      end
       user
     end
 

data/lib/mongo/mongo_client.rb

@@ -160,7 +160,7 @@ module Mongo
 
     # Initialize a connection to MongoDB using the MongoDB URI spec.
     #
-    # Since MongoClient.new cannot be used with any <code>ENV["MONGODB_URI"]</code> that has multiple hosts (implying a replicaset), 
+    # Since MongoClient.new cannot be used with any <code>ENV["MONGODB_URI"]</code> that has multiple hosts (implying a replicaset),
     # you may use this when the type of your connection varies by environment and should be determined solely from <code>ENV["MONGODB_URI"]</code>.
     #
     # @param uri [String]
@@ -469,7 +469,7 @@ module Mongo
     # NOTE: Do check if this needs to be more stringent.
     # Probably not since if any node raises a connection failure, all nodes will be closed.
     def connected?
-      @primary_pool && !@primary_pool.closed?
+      !!(@primary_pool && !@primary_pool.closed?)
     end
 
     # Determine if the connection is active. In a normal case the *server_info* operation
@@ -545,6 +545,32 @@ module Mongo
       end
     end
 
+    # Internal method for checking isMaster() on a given node.
+    #
+    # @param  node [Array] Port and host for the target node
+    # @return [Hash] Response from isMaster()
+    #
+    # @private
+    def check_is_master(node)
+      begin
+        host, port = *node
+        config = nil
+        socket = @socket_class.new(host, port, @op_timeout, @connect_timeout)
+        if @connect_timeout
+          Timeout::timeout(@connect_timeout, OperationTimeout) do
+            config = self['admin'].command({:ismaster => 1}, :socket => socket)
+          end
+        else
+          config = self['admin'].command({:ismaster => 1}, :socket => socket)
+        end
+      rescue OperationFailure, SocketError, SystemCallError, IOError
+        close
+      ensure
+        socket.close unless socket.nil? || socket.closed?
+      end
+      config
+    end
+
     protected
 
     def valid_opts
@@ -621,31 +647,6 @@ module Mongo
 
     private
 
-    def check_is_master(node)
-      begin
-        host, port = *node
-        socket = nil
-        config = nil
-
-        socket = @socket_class.new(host, port, @op_timeout, @connect_timeout)
-        if(@connect_timeout)
-          Timeout::timeout(@connect_timeout, OperationTimeout) do
-            config = self['admin'].command({:ismaster => 1}, :socket => socket)
-          end
-        else
-          config = self['admin'].command({:ismaster => 1}, :socket => socket)
-        end
-      rescue OperationFailure, SocketError, SystemCallError, IOError
-        close
-      ensure
-        if socket
-          socket.close unless socket.closed?
-        end
-      end
-
-      config
-    end
-
     # Set the specified node as primary.
     def set_primary(node)
       host, port = *node

data/lib/mongo/mongo_replica_set_client.rb

@@ -137,14 +137,9 @@ module Mongo
       # Lock for request ids.
       @id_lock = Mutex.new
 
-      @pool_mutex = Mutex.new
       @connected = false
 
-      @safe_mutex_lock = Mutex.new
-      @safe_mutexes = Hash.new {|hash, key| hash[key] = Mutex.new}
-
       @connect_mutex = Mutex.new
-      @refresh_mutex = Mutex.new
 
       @mongos = false
 
@@ -162,7 +157,8 @@ module Mongo
     end
 
     # Initiate a connection to the replica set.
-    def connect
+    def connect(force = !connected?)
+      return unless force
       log(:info, "Connecting...")
 
       # Prevent recursive connection attempts from the same thread.
@@ -170,15 +166,18 @@ module Mongo
       # infinitely while attempting to connect and continually failing. Instead, fail fast.
       raise ConnectionFailure, "Failed to get node data." if thread_local[:locks][:connecting] == true
 
+      current_version = @refresh_version
       @connect_mutex.synchronize do
-        return if @connected
+        # don't try to connect if another thread has done so while we were waiting for the lock
+        return unless current_version == @refresh_version
         begin
           thread_local[:locks][:connecting] = true
           if @manager
-            @manager.refresh! @seeds
+            ensure_manager
+            @manager.refresh!(@seeds)
           else
             @manager = PoolManager.new(self, @seeds)
-            thread_local[:managers][self] = @manager
+            ensure_manager
             @manager.connect
           end
         ensure
@@ -210,6 +209,7 @@ module Mongo
       end
 
       log(:debug, "Checking replica set connection health...")
+      ensure_manager
       @manager.check_connection_health
 
       if @manager.refresh_required?
@@ -227,9 +227,7 @@ module Mongo
     #   to get the refresh lock.
     def hard_refresh!
       log(:info, "Initiating hard refresh...")
-      @manager.refresh! @seeds
-
-      @refresh_version += 1
+      connect(true)
       return true
     end
 
@@ -420,6 +418,10 @@ module Mongo
       local_manager ? local_manager.secondary_pools : []
     end
 
+    def pools
+      local_manager ? local_manager.pools : []
+    end
+
     def tag_map
       local_manager ? local_manager.tag_map : {}
     end
@@ -475,16 +477,8 @@ module Mongo
     def sync_refresh
       if @refresh_mode == :sync &&
         ((Time.now - @last_refresh) > @refresh_interval)
-
         @last_refresh = Time.now
-
-        if @refresh_mutex.try_lock
-          begin
-            refresh
-          ensure
-            @refresh_mutex.unlock
-          end
-        end
+        refresh
       end
     end
   end

data/lib/mongo/mongo_sharded_client.rb

@@ -41,14 +41,9 @@ module Mongo
       # Lock for request ids.
       @id_lock = Mutex.new
 
-      @pool_mutex = Mutex.new
       @connected = false
 
-      @safe_mutex_lock = Mutex.new
-      @safe_mutexes = Hash.new {|hash, key| hash[key] = Mutex.new}
-
       @connect_mutex = Mutex.new
-      @refresh_mutex = Mutex.new
 
       @mongos        = true
 
@@ -66,7 +61,7 @@ module Mongo
     end
 
     # Initiate a connection to the sharded cluster.
-    def connect(force = !@connected)
+    def connect(force = !connected?)
       return unless force
       log(:info, "Connecting...")
 
@@ -79,10 +74,11 @@ module Mongo
         begin
           thread_local[:locks][:connecting] = true
           if @manager
+            thread_local[:managers][self] = @manager
             @manager.refresh! @seeds
           else
             @manager = ShardingPoolManager.new(self, @seeds)
-            thread_local[:managers][self] = @manager
+            ensure_manager
             @manager.connect
           end
         ensure
@@ -108,7 +104,7 @@ module Mongo
     end
 
     def connected?
-      @connected && @manager.primary_pool
+      !!(@connected && @manager.primary_pool)
     end
 
     # Returns +true+ if it's okay to read from a secondary node.
@@ -140,7 +136,8 @@ module Mongo
     # @param opts [ Hash ] Any of the options available for MongoShardedClient.new
     #
     # @return [ Mongo::MongoShardedClient ] The sharded client.
-    def self.from_uri(uri = ENV['MONGODB_URI'], options = {})
+    def self.from_uri(uri, options = {})
+      uri ||= ENV['MONGODB_URI']
       URIParser.new(uri).connection(options, false, true)
     end
   end

data/lib/mongo/util/node.rb

@@ -90,6 +90,7 @@ module Mongo
           end
 
           @config = @client['admin'].command({:ismaster => 1}, :socket => @socket)
+          update_max_sizes
 
           if @config['msg']
             @client.log(:warn, "#{config['msg']}")
@@ -106,7 +107,6 @@ module Mongo
           close
         end
       end
-      @manager.update_max_sizes
     end
 
     # Return a list of replica set nodes from the config.
@@ -151,11 +151,11 @@ module Mongo
     end
 
     def max_bson_size
-      max = config['maxBsonObjectSize'] || DEFAULT_MAX_BSON_SIZE
+      @max_bson_size || DEFAULT_MAX_BSON_SIZE
     end
 
     def max_message_size
-      max = config['maxMessageSizeBytes'] || max_bson_size * MESSAGE_SIZE_FACTOR
+      @max_message_size || max_bson_size * MESSAGE_SIZE_FACTOR
     end
 
     protected
@@ -186,5 +186,12 @@ module Mongo
         end
       end
     end
+
+    private
+
+    def update_max_sizes
+      @max_bson_size = config['maxBsonObjectSize'] || DEFAULT_MAX_BSON_SIZE
+      @max_message_size = config['maxMessageSizeBytes'] || @max_bson_size * MESSAGE_SIZE_FACTOR
+    end
   end
 end

data/lib/mongo/util/pool_manager.rb

@@ -9,8 +9,6 @@ module Mongo
                 :primary_pool,
                 :secondary_pools,
                 :hosts,
-                :nodes,
-                :members,
                 :seeds,
                 :pools,
                 :max_bson_size,
@@ -24,19 +22,21 @@ module Mongo
     # time. The union of these lists will be used when attempting to connect,
     # with the newly-discovered nodes being used first.
     def initialize(client, seeds=[])
-      @client               = client
-      @seeds                = seeds
-
-      @pools                = Set.new
-      @primary              = nil
-      @primary_pool         = nil
-      @secondaries          = Set.new
-      @secondary_pools      = []
-      @hosts                = Set.new
-      @members              = Set.new
-      @refresh_required     = false
-      @max_bson_size        = DEFAULT_MAX_BSON_SIZE
-      @max_message_size     = @max_bson_size * MESSAGE_SIZE_FACTOR
+      @client                                   = client
+      @seeds                                    = seeds
+
+      @pools                                    = Set.new
+      @primary                                  = nil
+      @primary_pool                             = nil
+      @secondaries                              = Set.new
+      @secondary_pools                          = []
+      @hosts                                    = Set.new
+      @members                                  = Set.new
+      @refresh_required                         = false
+      @max_bson_size                            = DEFAULT_MAX_BSON_SIZE
+      @max_message_size                         = @max_bson_size * MESSAGE_SIZE_FACTOR
+      @connect_mutex                            = Mutex.new
+      thread_local[:locks][:connecting_manager] = false
     end
 
     def inspect
@@ -44,11 +44,19 @@ module Mongo
     end
 
     def connect
-      @refresh_required = false
-      disconnect_old_members
-      connect_to_members
-      initialize_pools(@members)
-      @seeds = discovered_seeds
+      @connect_mutex.synchronize do
+        begin
+          thread_local[:locks][:connecting_manager] = true
+          @refresh_required = false
+          disconnect_old_members
+          connect_to_members
+          initialize_pools(@members)
+          update_max_sizes
+          @seeds = discovered_seeds
+        ensure
+          thread_local[:locks][:connecting_manager] = false
+        end
+      end
     end
 
     def refresh!(additional_seeds)
@@ -61,6 +69,8 @@ module Mongo
     # to our view. If any of these isn't the case,
     # set @refresh_required to true, and return.
     def check_connection_health
+      return if thread_local[:locks][:connecting_manager]
+      members = copy_members
       begin
         seed = get_valid_seed_node
       rescue ConnectionFailure
@@ -74,14 +84,14 @@ module Mongo
         return
       end
 
-      if current_config['hosts'].length != @members.length
+      if current_config['hosts'].length != members.length
         @refresh_required = true
         seed.close
         return
       end
 
       current_config['hosts'].each do |host|
-        member = @members.detect do |m|
+        member = members.detect do |m|
           m.address == host
         end
 
@@ -90,7 +100,7 @@ module Mongo
         else
           @refresh_required = true
           seed.close
-          return false
+          return
         end
       end
 
@@ -117,6 +127,8 @@ module Mongo
       read_pool.host_port
     end
 
+    private
+
     def update_max_sizes
       unless @members.size == 0
         @max_bson_size = @members.map(&:max_bson_size).min
@@ -124,8 +136,6 @@ module Mongo
       end
     end
 
-    private
-
     def validate_existing_member(current_config, member)
       if current_config['ismaster'] && member.last_state != :primary
         return false
@@ -152,13 +162,13 @@ module Mongo
             existing.set_config
             # If we are unhealthy after refreshing our config, drop from the set.
             if !existing.healthy?
-              @members.delete existing
+              @members.delete(existing)
             else
               next
             end
           else
             existing.close
-            @members.delete existing
+            @members.delete(existing)
           end
         end
 
@@ -242,11 +252,19 @@ module Mongo
         "#{@seeds.map {|s| "#{s[0]}:#{s[1]}" }.join(', ')}"
     end
 
-    private
-
     def discovered_seeds
       @members.map(&:host_port)
     end
 
+    def copy_members
+       members = Set.new
+       @connect_mutex.synchronize do
+         @members.map do |m|
+           members << m.dup
+         end
+       end
+       members
+     end
+
   end
 end

data/lib/mongo/util/read_preference.rb

@@ -9,11 +9,11 @@ module Mongo
     ]
 
     MONGOS_MODES = {
-      :primary              => :primary,
-      :primary_preferred    => :primaryPreferred,
-      :secondary            => :secondary,
-      :secondary_preferred  => :secondaryPreferred,
-      :nearest              => :nearest
+      :primary              => 'primary',
+      :primary_preferred    => 'primaryPreferred',
+      :secondary            => 'secondary',
+      :secondary_preferred  => 'secondaryPreferred',
+      :nearest              => 'nearest'
     }
 
     def self.mongos(mode, tag_sets)
@@ -77,7 +77,7 @@ module Mongo
         when :secondary_preferred
           select_secondary_pool(secondary_pools, read_pref) || primary_pool
         when :nearest
-          select_secondary_pool(pools, read_pref)
+          select_near_pool(pools, read_pref)
       end
     end
 

data/lib/mongo/util/sharding_pool_manager.rb

@@ -12,30 +12,43 @@ module Mongo
     end
 
     def connect
-      @refresh_required = false
-      disconnect_old_members
-      connect_to_members
-      initialize_pools best(@members)
-      @seeds = discovered_seeds
+      @connect_mutex.synchronize do
+        begin
+          thread_local[:locks][:connecting_manager] = true
+          @refresh_required = false
+          disconnect_old_members
+          connect_to_members
+          initialize_pools best(@members)
+          update_max_sizes
+          @seeds = discovered_seeds
+        ensure
+          thread_local[:locks][:connecting_manager] = false
+        end
+      end
     end
 
-    # We want to refresh to the member with the fastest ping time
-    # but also want to minimize refreshes
-    # We're healthy if the primary is pingable. If this isn't the case,
-    # or the members have changed, set @refresh_required to true, and return.
-    # The config.mongos find can't be part of the connect call chain due to infinite recursion
+    # Checks that each node is healthy (via check_is_master) and that each
+    # node is in fact a mongos. If either criteria are not true, a refresh is
+    # set to be triggered and close() is called on the node.
+    #
+    # @return [Boolean] indicating if a refresh is required.
     def check_connection_health
-      begin
-        seeds = @client['config']['mongos'].find.map do |mongos|
-                  Support.normalize_seeds(mongos['_id'])
-                end
-        if discovered_seeds != seeds
-          @seeds = seeds
+      @refresh_required = false
+      @members.each do |member|
+        begin
+          config = @client.check_is_master([member.host, member.port])
+          unless config && config.has_key?('msg')
+            @refresh_required = true
+            member.close
+          end
+        rescue OperationTimeout
           @refresh_required = true
+          member.close
         end
-      rescue Mongo::OperationFailure
-        @refresh_required = true
+        break if @refresh_required
       end
+      @refresh_required
     end
+
   end
 end

data/test/functional/authentication_test.rb

@@ -8,10 +8,7 @@ class AuthenticationTest < Test::Unit::TestCase
   def setup
     @client = MongoClient.new
     @db     = @client[MONGO_TEST_DB]
-  end
-
-  def teardown
-    @db['system.users'].remove
+    init_auth
   end
 
   def test_authenticate_with_connection_uri

data/test/replica_set/authentication_test.rb

@@ -8,11 +8,8 @@ class ReplicaSetAuthenticationTest < Test::Unit::TestCase
   def setup
     ensure_cluster(:rs)
     @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :name => @rs.repl_set_name, :connect_timeout => 60)
-    @db     = @client[MONGO_TEST_DB]
-  end
-
-  def teardown
-    @db['system.users'].remove
+    @db = @client[MONGO_TEST_DB]
+    init_auth
   end
 
   def test_authenticate_with_connection_uri

data/test/replica_set/client_test.rb

@@ -11,6 +11,21 @@ class ClientTest < Test::Unit::TestCase
     @client.close if @client
   end
 
+  def test_reconnection
+    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    assert @client.connected?
+
+    manager = @client.local_manager
+
+    @client.close
+    assert !@client.connected?
+    assert !@client.local_manager
+
+    @client.connect
+    assert @client.connected?
+    assert_equal @client.local_manager, manager
+  end
+
   # TODO: test connect timeout.
 
   def test_connect_with_deprecated_multi

data/test/replica_set/max_values_test.rb

@@ -7,6 +7,12 @@ class MaxValuesTest < Test::Unit::TestCase
   def setup
     ensure_cluster(:rs)
     @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :name => @rs.repl_set_name)
+    @db = new_mock_db
+    @client.stubs(:[]).returns(@db)
+    @ismaster = {
+      'hosts' => @client.local_manager.hosts.to_a,
+      'arbiters' => @client.local_manager.arbiters
+    }
   end
 
   def test_initial_max_sizes
@@ -15,43 +21,52 @@ class MaxValuesTest < Test::Unit::TestCase
   end
 
   def test_updated_max_sizes_after_node_config_change
-    # stub max sizes for one member
-    @client.local_manager.members.each_with_index do |m, i|
-      if i % 2 == 0
-        m.stubs(:config).returns({'maxMessageSizeBytes' => 1024 * MESSAGE_SIZE_FACTOR, 'maxBsonObjectSize' => 1024})
-        m.set_config
-      end
-    end
+    @db.stubs(:command).returns(
+      @ismaster.merge({'ismaster' => true}),
+      @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 1024 * MESSAGE_SIZE_FACTOR}),
+      @ismaster.merge({'secondary' => true, 'maxBsonObjectSize' => 1024})
+    )
+    @client.local_manager.stubs(:refresh_required?).returns(true)
+    @client.refresh
 
     assert_equal 1024, @client.max_bson_size
     assert_equal 1024 * MESSAGE_SIZE_FACTOR, @client.max_message_size
   end
 
   def test_neither_max_sizes_in_config
-    @client.local_manager.members.each do |m|
-      m.stubs(:config).returns({})
-      m.set_config
-    end
+    @db.stubs(:command).returns(
+      @ismaster.merge({'ismaster' => true}),
+      @ismaster.merge({'secondary' => true}),
+      @ismaster.merge({'secondary' => true})
+    )
+    @client.local_manager.stubs(:refresh_required?).returns(true)
+    @client.refresh
 
     assert_equal DEFAULT_MAX_BSON_SIZE, @client.max_bson_size
     assert_equal DEFAULT_MAX_BSON_SIZE * MESSAGE_SIZE_FACTOR, @client.max_message_size
   end
 
   def test_only_bson_size_in_config
-    @client.local_manager.members.each do |m|
-      m.stubs(:config).returns({'maxBsonObjectSize' => 1024})
-      m.set_config
-    end
+    @db.stubs(:command).returns(
+      @ismaster.merge({'ismaster' => true}),
+      @ismaster.merge({'secondary' => true}),
+      @ismaster.merge({'secondary' => true, 'maxBsonObjectSize' => 1024})
+    )
+    @client.local_manager.stubs(:refresh_required?).returns(true)
+    @client.refresh
+
     assert_equal 1024, @client.max_bson_size
     assert_equal 1024 * MESSAGE_SIZE_FACTOR, @client.max_message_size
   end
 
   def test_both_sizes_in_config
-    @client.local_manager.members.each do |m|
-      m.stubs(:config).returns({'maxMessageSizeBytes' => 1024 * 2 * MESSAGE_SIZE_FACTOR,
-                                'maxBsonObjectSize' => 1024})
-      m.set_config
-    end
+    @db.stubs(:command).returns(
+      @ismaster.merge({'ismaster' => true, 'maxMessageSizeBytes' => 1024 * 2 * MESSAGE_SIZE_FACTOR, 'maxBsonObjectSize' => 1024}),
+      @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 1024 * 2 * MESSAGE_SIZE_FACTOR, 'maxBsonObjectSize' => 1024}),
+      @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 1024 * 2 * MESSAGE_SIZE_FACTOR, 'maxBsonObjectSize' => 1024})
+    )
+    @client.local_manager.stubs(:refresh_required?).returns(true)
+    @client.refresh
 
     assert_equal 1024, @client.max_bson_size
     assert_equal 1024 * 2 * MESSAGE_SIZE_FACTOR, @client.max_message_size

data/test/replica_set/refresh_test.rb

@@ -78,6 +78,37 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
       "No secondaries have been added."
     assert_equal num_secondaries, client.secondary_pools.size
   end
+
+  def test_concurrent_refreshes
+    factor = 5
+    nthreads = factor * 10
+    threads = []
+    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :refresh_mode => :sync, :refresh_interval => 1)
+
+    nthreads.times do |i|
+      threads << Thread.new do
+        # force a connection failure every couple of threads that causes a refresh
+        if i % factor == 0
+          cursor = client['foo']['bar'].find
+          cursor.stubs(:checkout_socket_from_connection).raises(ConnectionFailure)
+          begin
+            cursor.next
+          rescue => ex
+            raise ex unless ex.class == ConnectionFailure
+            next
+          end
+        else
+          # synchronous refreshes will happen every couple of find_ones
+          cursor = client['foo']['bar'].find_one
+        end
+      end
+    end
+
+    threads.each do |t|
+      t.join
+    end
+  end
+
 =begin
   def test_automated_refresh_with_removed_node
     client = MongoReplicaSetClient.new(@rs.repl_set_seeds,

data/test/sharded_cluster/basic_test.rb

@@ -36,7 +36,7 @@ class BasicTest < Test::Unit::TestCase
     @client = MongoClient.new(host, port, {:read => :secondary, :tag_sets => tags})
     assert @client.connected?
     cursor = Cursor.new(@client[MONGO_TEST_DB]['whatever'], {})
-    assert_equal cursor.construct_query_spec['$readPreference'], {:mode => :secondary, :tags => tags}
+    assert_equal cursor.construct_query_spec['$readPreference'], {:mode => 'secondary', :tags => tags}
   end
 
   def test_find_one_with_read_secondary
@@ -68,7 +68,7 @@ class BasicTest < Test::Unit::TestCase
     @client = MongoShardedClient.new(@seeds, {:read => :secondary, :tag_sets => tags})
     assert @client.connected?
     cursor = Cursor.new(@client[MONGO_TEST_DB]['whatever'], {})
-    assert_equal cursor.construct_query_spec['$readPreference'], {:mode => :secondary, :tags => tags}
+    assert_equal cursor.construct_query_spec['$readPreference'], {:mode => 'secondary', :tags => tags}
   end
 
   def test_hard_refresh

data/test/shared/authentication.rb

@@ -1,4 +1,21 @@
 module AuthenticationTests
+
+  def init_auth
+    # enable authentication by creating and logging in as admin user
+    @admin = @client['admin']
+    @admin.add_user('admin', 'password')
+    @admin.authenticate('admin', 'password')
+  end
+
+  def teardown
+    @admin.logout
+    @admin.authenticate('admin','password')
+    @admin['system.users'].remove
+    @db['system.users'].remove
+    @db['test'].remove
+    @admin.logout
+  end
+
   def test_add_user
     @db.add_user('bob','user')
     assert @db['system.users'].find_one({:user => 'bob'})

data/test/test_helper.rb

@@ -1,4 +1,10 @@
-require 'rubygems'
+begin
+  require 'pry-rescue'
+  require 'pry-nav'
+rescue LoadError
+  # failed to load, skipping pry
+end
+
 # SimpleCov must load before our code - A coverage report summary line will print after each test suite
 if RUBY_VERSION >= '1.9.0' && RUBY_ENGINE == 'ruby'
   if ENV.key?('COVERAGE')

data/test/tools/mongo_config.rb

@@ -35,7 +35,7 @@ module Mongo
     MONGODS_OPT_KEYS = [:mongods]
     CLUSTER_OPT_KEYS = SHARDING_OPT_KEYS + REPLICA_OPT_KEYS + MONGODS_OPT_KEYS
 
-    FLAGS = [:noprealloc, :smallfiles, :logappend, :configsvr, :shardsvr, :quiet, :fastsync]
+    FLAGS = [:noprealloc, :smallfiles, :logappend, :configsvr, :shardsvr, :quiet, :fastsync, :auth]
 
     DEFAULT_VERIFIES = 60
     BASE_PORT = 3000
@@ -108,18 +108,24 @@ module Mongo
                    :smallfiles => smallfiles,
                    :noprealloc => noprealloc,
                    :quiet      => quiet,
-                   :fastsync   => fast_sync)
+                   :fastsync   => fast_sync,
+                   :auth       => auth)
     end
 
-    def self.make_replica(opts, count)
+    def self.make_replica(opts, id)
       params     = make_mongod('replicas', opts)
 
       replSet    = opts[:replSet]    || 'ruby-driver-test'
-      oplog_size = opts[:oplog_size] || 5
+      oplogSize  = opts[:oplog_size] || 5
+      keyFile    = opts[:key_file]   || '/test/tools/keyfile.txt'
 
-      params.merge(:_id       => count,
+      keyFile    = Dir.pwd << keyFile
+      system "chmod 600 #{keyFile}"
+
+      params.merge(:_id       => id,
                    :replSet   => replSet,
-                   :oplogSize => oplog_size)
+                   :oplogSize => oplogSize,
+                   :keyFile   => keyFile)
     end
 
     def self.make_config(opts)
@@ -187,7 +193,7 @@ module Mongo
           if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
             @pid = Process.spawn(*@cmd)
           else
-            cmd_and_opts = [@cmd, {:out => :close}].flatten
+            cmd_and_opts = [@cmd, {:out => '/dev/null'}].flatten
             @pid = Process.spawn(*cmd_and_opts)
           end
           verify(verifies) if verifies > 0

data/test/unit/cursor_test.rb

@@ -124,7 +124,7 @@ class CursorTest < Test::Unit::TestCase
 
         spec = cursor.construct_query_spec
         assert spec.has_key?('$readPreference')
-        assert_equal :secondary, spec['$readPreference'][:mode]
+        assert_equal 'secondary', spec['$readPreference'][:mode]
         assert !spec['$readPreference'].has_key?(:tags)
 
         # secondary preferred with tags
@@ -132,7 +132,7 @@ class CursorTest < Test::Unit::TestCase
 
         spec = cursor.construct_query_spec
         assert spec.has_key?('$readPreference')
-        assert_equal :secondaryPreferred, spec['$readPreference'][:mode]
+        assert_equal 'secondaryPreferred', spec['$readPreference'][:mode]
         assert_equal @tag_sets, spec['$readPreference'][:tags]
 
         # primary preferred
@@ -140,7 +140,7 @@ class CursorTest < Test::Unit::TestCase
 
         spec = cursor.construct_query_spec
         assert spec.has_key?('$readPreference')
-        assert_equal :primaryPreferred, spec['$readPreference'][:mode]
+        assert_equal 'primaryPreferred', spec['$readPreference'][:mode]
         assert !spec['$readPreference'].has_key?(:tags)
 
         # primary preferred with tags
@@ -148,7 +148,7 @@ class CursorTest < Test::Unit::TestCase
 
         spec = cursor.construct_query_spec
         assert spec.has_key?('$readPreference')
-        assert_equal :primaryPreferred, spec['$readPreference'][:mode]
+        assert_equal 'primaryPreferred', spec['$readPreference'][:mode]
         assert_equal @tag_sets, spec['$readPreference'][:tags]
 
         # nearest
@@ -156,7 +156,7 @@ class CursorTest < Test::Unit::TestCase
 
         spec = cursor.construct_query_spec
         assert spec.has_key?('$readPreference')
-        assert_equal :nearest, spec['$readPreference'][:mode]
+        assert_equal 'nearest', spec['$readPreference'][:mode]
         assert !spec['$readPreference'].has_key?(:tags)
 
         # nearest with tags
@@ -164,7 +164,7 @@ class CursorTest < Test::Unit::TestCase
 
         spec = cursor.construct_query_spec
         assert spec.has_key?('$readPreference')
-        assert_equal :nearest, spec['$readPreference'][:mode]
+        assert_equal 'nearest', spec['$readPreference'][:mode]
         assert_equal @tag_sets, spec['$readPreference'][:tags]
       end
 

data/test/unit/mongo_sharded_client_test.rb

@@ -9,24 +9,24 @@ class MongoShardedClientTest < Test::Unit::TestCase
 
   def test_initialize_with_single_mongos_uri
     ENV["MONGODB_URI"] = "mongodb://localhost:27017"
-    client = MongoShardedClient.new
+    client = MongoShardedClient.new(:connect => false)
     assert_equal [[ "localhost", 27017 ]], client.seeds
   end
 
   def test_initialize_with_multiple_mongos_uris
     ENV["MONGODB_URI"] = "mongodb://localhost:27017,localhost:27018"
-    client = MongoShardedClient.new
+    client = MongoShardedClient.new(:connect => false)
     assert_equal [[ "localhost", 27017 ], [ "localhost", 27018 ]], client.seeds
   end
 
   def test_from_uri_with_string
-    client = MongoShardedClient.from_uri("mongodb://localhost:27017,localhost:27018")
+    client = MongoShardedClient.from_uri("mongodb://localhost:27017,localhost:27018", :connect => false)
     assert_equal [[ "localhost", 27017 ], [ "localhost", 27018 ]], client.seeds
   end
 
   def test_from_uri_with_env_variable
     ENV["MONGODB_URI"] = "mongodb://localhost:27017,localhost:27018"
-    client = MongoShardedClient.from_uri
+    client = MongoShardedClient.from_uri(nil, :connect => false)
     assert_equal [[ "localhost", 27017 ], [ "localhost", 27018 ]], client.seeds
   end
 end

data/test/unit/read_pref_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class ReadPrefTest < Test::Unit::TestCase
+  include ReadPreference
+
+  def setup
+    mock_pool = mock()
+    mock_pool.stubs(:ping_time).returns(Pool::MAX_PING_TIME)
+
+    stubs(:primary_pool).returns(mock_pool)
+    stubs(:secondary_pools).returns([mock_pool])
+    stubs(:pools).returns([mock_pool])
+  end
+
+  def test_select_pool
+    ReadPreference::READ_PREFERENCES.map do |rp|
+      assert select_pool({:mode => rp, :tags => [], :latency => 15})
+    end
+  end
+
+end

data/test/unit/sharding_pool_manager_test.rb

@@ -59,30 +59,5 @@ class ShardingPoolManagerTest < Test::Unit::TestCase
       assert_equal 500, manager.max_bson_size
       assert_equal 700 , manager.max_message_size
     end
-
-    should "maintain seed format when checking connection health" do
-
-      @db.stubs(:command).returns(
-        # First call to get a socket.
-        @ismaster.merge({'ismaster' => true}),
-
-        # Subsequent calls to configure pools.
-        @ismaster.merge({'ismaster' => true}),
-        @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 700}),
-        @ismaster.merge({'secondary' => true, 'maxBsonObjectSize' => 500}),
-        @ismaster.merge({'arbiterOnly' => true})
-      )
-
-      config_db = new_mock_db
-      mongos_coll = mock('collection')
-      mongos_coll.stubs(:find).returns(@hosts.map{|h| {'_id' => h}})
-      config_db.stubs(:[]).with('mongos').returns(mongos_coll)
-      @client.stubs(:[]).with('config').returns(config_db)
-
-      manager = Mongo::ShardingPoolManager.new(@client, @hosts)
-      manager.check_connection_health
-
-      assert manager.seeds.all? {|s| s.is_a?(Array) && s[0].is_a?(String) && s[1].is_a?(Integer)}
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
 - Tyler Brock
@@ -33,7 +33,7 @@ cert_chain:
   8v7zLF2XliYbfurYIwkcXs8yPn8ggApBIy9bX6VJxRs/l2+UvqzaHIFaFy/F8/GP
   RNTuXsVG5NDACo7Q
   -----END CERTIFICATE-----
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -41,14 +41,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.8.6
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables:
@@ -143,6 +143,7 @@ files:
 - test/unit/node_test.rb
 - test/unit/pool_manager_test.rb
 - test/unit/pool_test.rb
+- test/unit/read_pref_test.rb
 - test/unit/read_test.rb
 - test/unit/safe_test.rb
 - test/unit/sharding_pool_manager_test.rb
@@ -223,6 +224,7 @@ test_files:
 - test/unit/node_test.rb
 - test/unit/pool_manager_test.rb
 - test/unit/pool_test.rb
+- test/unit/read_pref_test.rb
 - test/unit/read_test.rb
 - test/unit/safe_test.rb
 - test/unit/sharding_pool_manager_test.rb

metadata.gz.sig

@@ -1 +1 @@
-�4������i[ �8�[��1׈�#Y,t�[
1Y�^R�ar��:�*�1��iؒ�o���v�T�M�L������^����>A3�P<	����_&��;k�tخ��Sz�v������B'��
�HU*+�z�N]@��ȳ��ϣ~2��Ul����h�>���8�]�7����߾�����r�����<
+;cJ�g����H�#~������Ç���������J�.�۞(T�.7{��<�!����:ݬ���T;�S���RJ��y��
A��x��D8ʒ�=k���
nL7�пk�Y�[>�����1*+>)5� ���i�qJ3��^*q&��f��