mongo 1.9.2 → 1.10.0.rc0

data/test/threading/basic_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
 
 require 'test_helper'
 
-class TestThreading < Test::Unit::TestCase
+class ThreadingTest < Test::Unit::TestCase
 
   include Mongo
 
   def setup
     @client = standard_connection(:pool_size => 10, :pool_timeout => 30)
-    @db = @client.db(MONGO_TEST_DB)
+    @db = @client.db(TEST_DB)
     @coll = @db.collection('thread-test-collection')
     @coll.drop
 
@@ -91,4 +91,30 @@ class TestThreading < Test::Unit::TestCase
     assert thread_values.all?{|v| v == 1000}
     assert_equal thread_values.size, n_threads
   end
+
+  def test_threading
+    @coll.drop
+    @coll = @db.collection('thread-test-collection')
+
+    docs = []
+    1000.times {|i| docs << {:x => i}}
+    @coll.insert(docs)
+
+    threads = []
+
+    10.times do |i|
+      threads[i] = Thread.new do
+        sum = 0
+        @coll.find().each do |document|
+          sum += document["x"]
+        end
+        assert_equal 499500, sum
+      end
+    end
+
+    10.times do |i|
+      threads[i].join
+    end
+  end
+
 end

data/test/tools/mongo_config.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ module Mongo
   class Config
     DEFAULT_BASE_OPTS = { :host => 'localhost', :dbpath => 'data', :logpath => 'data/log' }
     DEFAULT_REPLICA_SET = DEFAULT_BASE_OPTS.merge( :replicas => 3, :arbiters => 0 )
-    DEFAULT_SHARDED_SIMPLE = DEFAULT_BASE_OPTS.merge( :shards => 2, :configs => 1, :routers => 4 )
+    DEFAULT_SHARDED_SIMPLE = DEFAULT_BASE_OPTS.merge( :shards => 2, :configs => 1, :routers => 2 )
     DEFAULT_SHARDED_REPLICA = DEFAULT_SHARDED_SIMPLE.merge( :replicas => 3, :arbiters => 0)
 
     IGNORE_KEYS = [:host, :command, :_id]
@@ -50,7 +50,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, :auth]
+    FLAGS = [:noprealloc, :smallfiles, :logappend, :configsvr, :shardsvr, :quiet, :fastsync, :auth, :ipv6]
 
     DEFAULT_VERIFIES = 60
     BASE_PORT = 3000
@@ -64,6 +64,7 @@ module Mongo
       raise "missing required option" if [:host, :dbpath].any?{|k| !opts[k]}
 
       config = opts.reject {|k,v| CLUSTER_OPT_KEYS.include?(k)}
+
       kinds = CLUSTER_OPT_KEYS.select{|key| opts.has_key?(key)} # order is significant
 
       replica_count = 0
@@ -117,6 +118,7 @@ module Mongo
       quiet      = opts[:quiet]      || true
       fast_sync  = opts[:fastsync]   || false
       auth       = opts[:auth]       || true
+      ipv6       = opts[:ipv6].nil? ? true : opts[:ipv6]
 
       params.merge(:command    => mongod,
                    :dbpath     => path,
@@ -124,7 +126,8 @@ module Mongo
                    :noprealloc => noprealloc,
                    :quiet      => quiet,
                    :fastsync   => fast_sync,
-                   :auth       => auth)
+                   :auth       => auth,
+                   :ipv6       => ipv6)
     end
 
     def self.make_replica(opts, id)
@@ -383,27 +386,48 @@ module Mongo
       end
 
       def repl_set_startup
-        states = nil
+        states     = nil
+        healthy    = false
+
         60.times do
-          states = repl_set_get_status.zip(repl_set_is_master)
+          # enter the thunderdome...
+          states  = repl_set_get_status.zip(repl_set_is_master)
           healthy = states.all? do |status, is_master|
-            members = status['members']
-            if status['ok'] == 1.0 && members.collect{|m| m['state']}.all?{|state| [1,2,7].index(state)}
-              members.any?{|m| m['state'] == 1} &&
-                case status['myState']
-                when 1
-                  is_master['ismaster'] == true && is_master['secondary'] == false
-                when 2
-                  is_master['ismaster'] == false && is_master['secondary'] == true
-                when 7
-                  is_master['ismaster'] == false && is_master['secondary'] == false
-                end
+            # check replica set status for member list
+            next unless status['ok'] == 1.0 && (members = status['members'])
+
+            # ensure all replica set members are in a valid state
+            next unless members.all? { |m| [1,2,7].include?(m['state']) }
+
+            # check for primary replica set member
+            next unless (primary = members.find { |m| m['state'] == 1 })
+
+            # check replica set member optimes
+            primary_optime = primary['optime'].seconds
+            next unless primary_optime && members.all? do |m|
+              m['state'] == 7 || primary_optime - m['optime'].seconds < 5
+            end
+
+            # check replica set state
+            case status['myState']
+              when 1
+                is_master['ismaster']  == true &&
+                is_master['secondary'] == false
+              when 2
+                is_master['ismaster']  == false &&
+                is_master['secondary'] == true
+              when 7
+                is_master['ismaster']  == false &&
+                is_master['secondary'] == false
             end
           end
-          return true if healthy
+
+          return healthy if healthy
           sleep(1)
         end
-        raise Mongo::OperationFailure, "replSet startup failed - status: #{states.inspect}"
+
+        raise Mongo::OperationFailure,
+          "replSet startup failed - status: #{states.inspect}"
       end
 
       def repl_set_seeds
@@ -424,7 +448,8 @@ module Mongo
 
       def member_names_by_state(state)
         states = Array(state)
-        status = repl_set_get_status.first
+        # Any status with a REMOVED node won't have the full cluster state
+        status = repl_set_get_status.find {|status| status['members'].find {|m| m['state'] == 'REMOVED'}.nil?}
         status['members'].find_all{|member| states.index(member['state']) }.collect{|member| member['name']}
       end
 

data/test/tools/mongo_config_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/unit/client_test.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 10gen Inc.
+# Copyright (C) 2009-2013 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 require 'test_helper'
 include Mongo
 
-class ClientTest < Test::Unit::TestCase
+class ClientUnitTest < Test::Unit::TestCase
   context "Mongo::MongoClient initialization " do
     context "given a single node" do
       setup do
@@ -92,7 +92,7 @@ class ClientTest < Test::Unit::TestCase
 
     context "initializing with a unix socket" do
       setup do
-          @connection = Mongo::Connection.new('/tmp/mongod.sock', :safe => true, :connect => false)
+          @connection = Mongo::Connection.new('/tmp/mongod.sock', :connect => false)
           UNIXSocket.stubs(:new).returns(new_mock_unix_socket)
       end
       should "parse a unix socket" do
@@ -106,11 +106,19 @@ class ClientTest < Test::Unit::TestCase
         assert_equal ['localhost', 27017], @client.host_port
       end
 
-      #should "parse a unix socket" do
-      #  socket_address = "/tmp/mongodb-27017.sock"
-      #  @client = MongoClient.from_uri("mongodb://#{socket_address}")
-      #  assert_equal socket_address, @client.host_port.first
-      #end
+      should "set auth source" do
+        @client = MongoClient.from_uri("mongodb://user:pass@localhost?authSource=foo", :connect => false)
+        assert_equal 'foo', @client.auths.first[:source]
+      end
+
+      should "set auth mechanism" do
+        @client = MongoClient.from_uri("mongodb://user@localhost?authMechanism=MONGODB-X509", :connect => false)
+        assert_equal 'MONGODB-X509', @client.auths.first[:mechanism]
+
+        assert_raise MongoArgumentError do
+          MongoClient.from_uri("mongodb://user@localhost?authMechanism=INVALID", :connect => false)
+        end
+      end
 
       should "allow a complex host names" do
         host_name = "foo.bar-12345.org"
@@ -142,8 +150,15 @@ class ClientTest < Test::Unit::TestCase
       should "parse a uri with a hyphen & underscore in the username or password" do
         @client = MongoClient.from_uri("mongodb://hyphen-user_name:p-s_s@localhost:27017/db", :connect => false)
         assert_equal ['localhost', 27017], @client.host_port
-        auth_hash = { :db_name => 'db', :username => 'hyphen-user_name', :password => 'p-s_s' }
-        assert_equal auth_hash, @client.auths[0]
+
+        auth_hash = {
+          :db_name   => 'db',
+          :username  => 'hyphen-user_name',
+          :password  => 'p-s_s',
+          :source    => 'db',
+          :mechanism => Authentication::DEFAULT_MECHANISM
+        }
+        assert_equal auth_hash, @client.auths.first
       end
 
       should "attempt to connect" do
@@ -166,99 +181,163 @@ class ClientTest < Test::Unit::TestCase
         end
       end
 
-      should "require all of username, if password and db are specified" do
+      should "require password if using legacy auth and username present" do
         assert MongoClient.from_uri("mongodb://kyle:jones@localhost/db", :connect => false)
 
         assert_raise MongoArgumentError do
-          MongoClient.from_uri("mongodb://kyle:password@localhost", :connect => false)
+          MongoClient.from_uri("mongodb://kyle:@localhost", :connect => false)
+        end
+
+        assert_raise MongoArgumentError do
+          MongoClient.from_uri("mongodb://kyle@localhost", :connect => false)
         end
       end
     end
 
     context "initializing with ENV['MONGODB_URI']" do
-      setup do
-        @old_mongodb_uri = ENV['MONGODB_URI']
+      should "parse a simple uri" do
+        uri = "mongodb://localhost?connect=false"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+          assert_equal ['localhost', 27017], @client.host_port
+        end
       end
 
-      teardown do
-        ENV['MONGODB_URI'] = @old_mongodb_uri
+      should "set auth source" do
+        uri = "mongodb://user:pass@localhost?authSource=foo&connect=false"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+          assert_equal 'foo', @client.auths.first[:source]
+        end
       end
 
-      should "parse a simple uri" do
-        ENV['MONGODB_URI'] = "mongodb://localhost?connect=false"
-        @client = MongoClient.new
-        assert_equal ['localhost', 27017], @client.host_port
+      should "set auth mechanism" do
+        uri = "mongodb://user@localhost?authMechanism=MONGODB-X509&connect=false"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+          assert_equal 'MONGODB-X509', @client.auths.first[:mechanism]
+
+          ENV['MONGODB_URI'] = "mongodb://user@localhost?authMechanism=INVALID&connect=false"
+          assert_raise MongoArgumentError do
+            MongoClient.new
+          end
+        end
       end
 
       should "allow a complex host names" do
         host_name = "foo.bar-12345.org"
-        ENV['MONGODB_URI'] = "mongodb://#{host_name}?connect=false"
-        @client = MongoClient.new
-        assert_equal [host_name, 27017], @client.host_port
+        uri = "mongodb://#{host_name}?connect=false"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+          assert_equal [host_name, 27017], @client.host_port
+        end
       end
 
       should "allow db without username and password" do
         host_name = "foo.bar-12345.org"
-        ENV['MONGODB_URI'] = "mongodb://#{host_name}/foo?connect=false"
-        @client = MongoClient.new
-        assert_equal [host_name, 27017], @client.host_port
+        uri = "mongodb://#{host_name}/foo?connect=false"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+          assert_equal [host_name, 27017], @client.host_port
+        end
       end
 
       should "set write concern options on connection" do
         host_name = "localhost"
         opts = "w=2&wtimeoutMS=1000&fsync=true&journal=true&connect=false"
-        ENV['MONGODB_URI'] = "mongodb://#{host_name}/foo?#{opts}"
-        @client = MongoClient.new
-        assert_equal({:w => 2, :wtimeout => 1000, :fsync => true, :j => true}, @client.write_concern)
+        uri = "mongodb://#{host_name}/foo?#{opts}"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+          assert_equal({:w => 2, :wtimeout => 1000, :fsync => true, :j => true}, @client.write_concern)
+        end
       end
 
       should "set timeout options on connection" do
         host_name = "localhost"
         opts = "connectTimeoutMS=1000&socketTimeoutMS=5000&connect=false"
-        ENV['MONGODB_URI'] = "mongodb://#{host_name}/foo?#{opts}"
-        @client = MongoClient.new
-        assert_equal 1, @client.connect_timeout
-        assert_equal 5, @client.op_timeout
+        uri = "mongodb://#{host_name}/foo?#{opts}"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+          assert_equal 1, @client.connect_timeout
+          assert_equal 5, @client.op_timeout
+        end
       end
 
       should "parse a uri with a hyphen & underscore in the username or password" do
-        ENV['MONGODB_URI'] = "mongodb://hyphen-user_name:p-s_s@localhost:27017/db?connect=false"
-        @client = MongoClient.new
-        assert_equal ['localhost', 27017], @client.host_port
-        auth_hash = { :db_name => 'db', :username => 'hyphen-user_name', :password => 'p-s_s' }
-        assert_equal auth_hash, @client.auths[0]
+        uri = "mongodb://hyphen-user_name:p-s_s@localhost:27017/db?connect=false"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+          assert_equal ['localhost', 27017], @client.host_port
+
+          auth_hash = {
+            :db_name   => 'db',
+            :username  => 'hyphen-user_name',
+            :password  => 'p-s_s',
+            :source    => 'db',
+            :mechanism => Authentication::DEFAULT_MECHANISM
+          }
+          assert_equal auth_hash, @client.auths.first
+        end
       end
 
       should "attempt to connect" do
         TCPSocket.stubs(:new).returns(new_mock_socket)
-        ENV['MONGODB_URI'] = "mongodb://localhost?connect=false" # connect=false ??
-        @client = MongoClient.new
-
-        admin_db = new_mock_db
-        admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
-        @client.expects(:[]).with('admin').returns(admin_db)
-        @client.connect
+        uri = "mongodb://localhost?connect=false"
+        with_preserved_env_uri(uri) do
+          @client = MongoClient.new
+
+          admin_db = new_mock_db
+          admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
+          @client.expects(:[]).with('admin').returns(admin_db)
+          @client.connect
+        end
       end
 
       should "raise an error on invalid uris" do
-        ENV['MONGODB_URI'] = "mongo://localhost"
-        assert_raise MongoArgumentError do
-          MongoClient.new
+        uri = "mongo://localhost"
+        with_preserved_env_uri(uri) do
+          assert_raise MongoArgumentError do
+            MongoClient.new
+          end
+
+          ENV['MONGODB_URI'] = "mongodb://localhost:abc?connect=false"
+          assert_raise MongoArgumentError do
+            MongoClient.new
+          end
         end
+      end
 
-        ENV['MONGODB_URI'] = "mongodb://localhost:abc"
-        assert_raise MongoArgumentError do
-          MongoClient.new
+      should "require password if using legacy auth and username present" do
+        uri = "mongodb://kyle:jones@localhost?connect=false"
+        with_preserved_env_uri(uri) do
+          assert MongoClient.new
+
+          ENV['MONGODB_URI'] = "mongodb://kyle:@localhost?connect=false"
+          assert_raise MongoArgumentError do
+            MongoClient.new
+          end
+
+          ENV['MONGODB_URI'] = "mongodb://kyle@localhost?connect=false"
+          assert_raise MongoArgumentError do
+            MongoClient.new
+          end
         end
       end
 
-      should "require all of username, if password and db are specified" do
-        ENV['MONGODB_URI'] = "mongodb://kyle:jones@localhost/db?connect=false"
-        assert MongoClient.new
+      should "require password if using PLAIN auth and username present" do
+        uri = "mongodb://kyle:jones@localhost?connect=false&authMechanism=PLAIN"
+        with_preserved_env_uri(uri) do
+          assert MongoClient.new
 
-        ENV['MONGODB_URI'] = "mongodb://kyle:password@localhost"
-        assert_raise MongoArgumentError do
-          MongoClient.new
+          ENV['MONGODB_URI'] = "mongodb://kyle:@localhost?connect=false&authMechanism=PLAIN"
+          assert_raise MongoArgumentError do
+            MongoClient.new
+          end
+
+          ENV['MONGODB_URI'] = "mongodb://kyle@localhost?connect=false&authMechanism=PLAIN"
+          assert_raise MongoArgumentError do
+            MongoClient.new
+          end
         end
       end
     end