mongo 1.1.4 → 1.1.5

data/test/tools/test.rb

@@ -0,0 +1,13 @@
+require 'repl_set_manager'
+
+m = ReplSetManager.new
+m.start_set
+
+node = m.kill_secondary
+m.ensure_up
+
+puts "Pausing..."
+gets
+
+m.start(node)
+m.ensure_up

data/test/unit/connection_test.rb

@@ -41,103 +41,21 @@ class ConnectionTest < Test::Unit::TestCase
       end
     end
 
-    context "connecting to a replica set" do
-      setup do
-        TCPSocket.stubs(:new).returns(new_mock_socket('localhost', 27017))
-        @conn = Connection.multi([['localhost', 27017]], :connect => false, :read_secondary => true)
-
-        admin_db = new_mock_db
-        @hosts = ['localhost:27018', 'localhost:27019', 'localhost:27020']
-
-        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts}).
-          then.returns({'ok' => 1, 'ismaster' => 0, 'hosts' => @hosts, 'secondary' => 1}).
-          then.returns({'ok' => 1, 'ismaster' => 0, 'hosts' => @hosts, 'secondary' => 1}).
-          then.returns({'ok' => 1, 'ismaster' => 0, 'arbiterOnly' => 1})
-
-        @conn.stubs(:[]).with('admin').returns(admin_db)
-        @conn.connect
-      end
-
-      should "store the hosts returned from the ismaster command" do
-        assert_equal 'localhost', @conn.primary_pool.host
-        assert_equal 27017, @conn.primary_pool.port
-
-        assert_equal 'localhost', @conn.secondary_pools[0].host
-        assert_equal 27018, @conn.secondary_pools[0].port
-
-        assert_equal 'localhost', @conn.secondary_pools[1].host
-        assert_equal 27019, @conn.secondary_pools[1].port
-
-        assert_equal 2, @conn.secondary_pools.length
-      end
-    end
-
-    context "connecting to a replica set and providing seed nodes" do
-      setup do
-        TCPSocket.stubs(:new).returns(new_mock_socket)
-        @conn = Connection.multi([['localhost', 27017], ['localhost', 27019]], :connect => false)
-
-        admin_db = new_mock_db
-        @hosts = ['localhost:27017', 'localhost:27018', 'localhost:27019']
-        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts})
-        @conn.stubs(:[]).with('admin').returns(admin_db)
-        @conn.connect
-      end
-
-      should "not store any hosts redundantly" do
-      end
-    end
-
-    context "initializing a paired connection" do
-      should "require left and right nodes" do
-        assert_raise MongoArgumentError do
-          Connection.multi(['localhost', 27018], :connect => false)
-        end
-
-        assert_raise MongoArgumentError do
-          Connection.multi(['localhost', 27018], :connect => false)
-        end
-      end
-
-      should "store both nodes" do
-        @conn = Connection.multi([['localhost', 27017], ['localhost', 27018]], :connect => false)
-
-        assert_equal ['localhost', 27017], @conn.nodes[0]
-        assert_equal ['localhost', 27018], @conn.nodes[1]
-      end
-    end
-
     context "initializing with a mongodb uri" do
       should "parse a simple uri" do
         @conn = Connection.from_uri("mongodb://localhost", :connect => false)
-        assert_equal ['localhost', 27017], @conn.nodes[0]
+        assert_equal ['localhost', 27017], @conn.host_to_try
       end
 
       should "allow a complex host names" do
         host_name = "foo.bar-12345.org"
         @conn = Connection.from_uri("mongodb://#{host_name}", :connect => false)
-        assert_equal [host_name, 27017], @conn.nodes[0]
-      end
-
-      should "parse a uri specifying multiple nodes" do
-        @conn = Connection.from_uri("mongodb://localhost:27017,mydb.com:27018", :connect => false)
-        assert_equal ['localhost', 27017], @conn.nodes[0]
-        assert_equal ['mydb.com', 27018], @conn.nodes[1]
-      end
-
-      should "parse a uri specifying multiple nodes with auth" do
-        @conn = Connection.from_uri("mongodb://kyle:s3cr3t@localhost:27017/app,mickey:m0u5e@mydb.com:27018/dsny", :connect => false)
-        assert_equal ['localhost', 27017], @conn.nodes[0]
-        assert_equal ['mydb.com', 27018], @conn.nodes[1]
-        auth_hash = {'username' => 'kyle', 'password' => 's3cr3t', 'db_name' => 'app'}
-        assert_equal auth_hash, @conn.auths[0]
-        auth_hash = {'username' => 'mickey', 'password' => 'm0u5e', 'db_name' => 'dsny'}
-        assert_equal auth_hash, @conn.auths[1]
+        assert_equal [host_name, 27017], @conn.host_to_try
       end
 
       should "parse a uri with a hyphen & underscore in the username or password" do
         @conn = Connection.from_uri("mongodb://hyphen-user_name:p-s_s@localhost:27017/db", :connect => false)
-        assert_equal ['localhost', 27017], @conn.nodes[0]
+        assert_equal ['localhost', 27017], @conn.host_to_try
         auth_hash = { 'db_name' => 'db', 'username' => 'hyphen-user_name', "password" => 'p-s_s' }
         assert_equal auth_hash, @conn.auths[0]
       end

data/test/unit/repl_set_connection_test.rb

@@ -0,0 +1,82 @@
+require './test/test_helper'
+include Mongo
+
+class ReplSetConnectionTest < Test::Unit::TestCase
+  context "Initialization: " do
+    setup do
+      def new_mock_socket(host='localhost', port=27017)
+        socket = Object.new
+        socket.stubs(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        socket.stubs(:close)
+        socket
+      end
+
+      def new_mock_db
+        db = Object.new
+      end
+    end
+
+    context "connecting to a replica set" do
+      setup do
+        TCPSocket.stubs(:new).returns(new_mock_socket('localhost', 27017))
+        @conn = ReplSetConnection.new(['localhost', 27017], :connect => false, :read_secondary => true)
+
+        admin_db = new_mock_db
+        @hosts = ['localhost:27018', 'localhost:27019', 'localhost:27020']
+
+        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts}).
+          then.returns({'ok' => 1, 'ismaster' => 0, 'hosts' => @hosts, 'secondary' => 1}).
+          then.returns({'ok' => 1, 'ismaster' => 0, 'hosts' => @hosts, 'secondary' => 1}).
+          then.returns({'ok' => 1, 'ismaster' => 0, 'arbiterOnly' => 1})
+
+        @conn.stubs(:[]).with('admin').returns(admin_db)
+        @conn.connect
+      end
+
+      should "store the hosts returned from the ismaster command" do
+        assert_equal 'localhost', @conn.primary_pool.host
+        assert_equal 27017, @conn.primary_pool.port
+
+        assert_equal 'localhost', @conn.secondary_pools[0].host
+        assert_equal 27018, @conn.secondary_pools[0].port
+
+        assert_equal 'localhost', @conn.secondary_pools[1].host
+        assert_equal 27019, @conn.secondary_pools[1].port
+
+        assert_equal 2, @conn.secondary_pools.length
+      end
+    end
+
+    context "connecting to a replica set and providing seed nodes" do
+      setup do
+        TCPSocket.stubs(:new).returns(new_mock_socket)
+        @conn = ReplSetConnection.new(['localhost', 27017], ['localhost', 27019], :connect => false)
+
+        admin_db = new_mock_db
+        @hosts = ['localhost:27017', 'localhost:27018', 'localhost:27019']
+        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts})
+        @conn.stubs(:[]).with('admin').returns(admin_db)
+        @conn.connect
+      end
+    end
+
+    context "initializing with a mongodb uri" do
+
+      should "parse a uri specifying multiple nodes" do
+        @conn = Connection.from_uri("mongodb://localhost:27017,mydb.com:27018", :connect => false)
+        assert_equal ['localhost', 27017], @conn.nodes[0]
+        assert_equal ['mydb.com', 27018], @conn.nodes[1]
+      end
+
+      should "parse a uri specifying multiple nodes with auth" do
+        @conn = Connection.from_uri("mongodb://kyle:s3cr3t@localhost:27017/app,mickey:m0u5e@mydb.com:27018/dsny", :connect => false)
+        assert_equal ['localhost', 27017], @conn.nodes[0]
+        assert_equal ['mydb.com', 27018], @conn.nodes[1]
+        auth_hash = {'username' => 'kyle', 'password' => 's3cr3t', 'db_name' => 'app'}
+        assert_equal auth_hash, @conn.auths[0]
+        auth_hash = {'username' => 'mickey', 'password' => 'm0u5e', 'db_name' => 'dsny'}
+        assert_equal auth_hash, @conn.auths[1]
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 1
-  - 4
-  version: 1.1.4
+  - 5
+  version: 1.1.5
 platform: ruby
 authors: 
 - Jim Menard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -05:00
+date: 2010-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 25
         segments: 
         - 1
         - 1
-        - 1
-        version: 1.1.1
+        - 5
+        version: 1.1.5
   type: :runtime
   version_requirements: *id001
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -54,6 +54,7 @@ files:
 - lib/mongo/collection.rb
 - lib/mongo/exceptions.rb
 - lib/mongo/connection.rb
+- lib/mongo/repl_set_connection.rb
 - lib/mongo/gridfs/grid_io.rb
 - lib/mongo/gridfs/grid_file_system.rb
 - lib/mongo/gridfs/grid.rb
@@ -64,6 +65,7 @@ files:
 - lib/mongo/util/pool.rb
 - lib/mongo/util/core_ext.rb
 - lib/mongo/util/server_version.rb
+- lib/mongo/util/uri_parser.rb
 - lib/mongo/db.rb
 - docs/HISTORY.md
 - docs/TUTORIAL.md
@@ -76,6 +78,7 @@ files:
 - bin/mongo_console
 - test/grid_file_system_test.rb
 - test/unit/db_test.rb
+- test/unit/repl_set_connection_test.rb
 - test/unit/collection_test.rb
 - test/unit/cursor_test.rb
 - test/unit/grid_test.rb
@@ -84,7 +87,6 @@ files:
 - test/unit/safe_test.rb
 - test/db_test.rb
 - test/collection_test.rb
-- test/rs.rb
 - test/cursor_test.rb
 - test/grid_test.rb
 - test/db_api_test.rb
@@ -95,8 +97,10 @@ files:
 - test/conversions_test.rb
 - test/connection_test.rb
 - test/cursor_message_test.rb
+- test/tools/test.rb
+- test/tools/repl_set_manager.rb
 - test/cursor_fail_test.rb
-- test/threading/test_threading_large_pool.rb
+- test/threading/threading_with_large_pool_test.rb
 - test/test_helper.rb
 - test/grid_io_test.rb
 - test/bson/byte_buffer_test.rb
@@ -109,20 +113,16 @@ files:
 - test/support/keys.rb
 - test/support/hash_with_indifferent_access.rb
 - test/db_connection_test.rb
+- test/replica_sets/rs_test_helper.rb
 - test/replica_sets/pooled_insert_test.rb
 - test/replica_sets/count_test.rb
 - test/replica_sets/replication_ack_test.rb
 - test/replica_sets/query_secondaries.rb
 - test/replica_sets/query_test.rb
-- test/replica_sets/node_type_test.rb
 - test/replica_sets/insert_test.rb
 - test/replica_sets/connect_test.rb
 - test/safe_test.rb
 - test/support_test.rb
-- test/replica_pairs/pooled_insert_test.rb
-- test/replica_pairs/count_test.rb
-- test/replica_pairs/query_test.rb
-- test/replica_pairs/insert_test.rb
 - test/threading_test.rb
 has_rdoc: true
 homepage: http://www.mongodb.org
@@ -163,6 +163,7 @@ summary: Ruby driver for the MongoDB
 test_files: 
 - test/grid_file_system_test.rb
 - test/unit/db_test.rb
+- test/unit/repl_set_connection_test.rb
 - test/unit/collection_test.rb
 - test/unit/cursor_test.rb
 - test/unit/grid_test.rb
@@ -171,7 +172,6 @@ test_files:
 - test/unit/safe_test.rb
 - test/db_test.rb
 - test/collection_test.rb
-- test/rs.rb
 - test/cursor_test.rb
 - test/grid_test.rb
 - test/db_api_test.rb
@@ -182,8 +182,10 @@ test_files:
 - test/conversions_test.rb
 - test/connection_test.rb
 - test/cursor_message_test.rb
+- test/tools/test.rb
+- test/tools/repl_set_manager.rb
 - test/cursor_fail_test.rb
-- test/threading/test_threading_large_pool.rb
+- test/threading/threading_with_large_pool_test.rb
 - test/test_helper.rb
 - test/grid_io_test.rb
 - test/bson/byte_buffer_test.rb
@@ -196,18 +198,14 @@ test_files:
 - test/support/keys.rb
 - test/support/hash_with_indifferent_access.rb
 - test/db_connection_test.rb
+- test/replica_sets/rs_test_helper.rb
 - test/replica_sets/pooled_insert_test.rb
 - test/replica_sets/count_test.rb
 - test/replica_sets/replication_ack_test.rb
 - test/replica_sets/query_secondaries.rb
 - test/replica_sets/query_test.rb
-- test/replica_sets/node_type_test.rb
 - test/replica_sets/insert_test.rb
 - test/replica_sets/connect_test.rb
 - test/safe_test.rb
 - test/support_test.rb
-- test/replica_pairs/pooled_insert_test.rb
-- test/replica_pairs/count_test.rb
-- test/replica_pairs/query_test.rb
-- test/replica_pairs/insert_test.rb
 - test/threading_test.rb

data/test/replica_pairs/count_test.rb

@@ -1,34 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require './test/test_helper'
-
-# NOTE: this test should be run only if a replica pair is running.
-class ReplicaPairCountTest < Test::Unit::TestCase
-  include Mongo
-
-  def setup
-    @conn = Mongo::Connection.new({:left => ["localhost", 27017], :right => ["localhost", 27018]}, nil)
-    @db = @conn.db('mongo-ruby-test')
-    @db.drop_collection("test-pairs")
-    @coll = @db.collection("test-pairs")
-  end
-
-  def test_correct_count_after_insertion_reconnect
-    @coll.insert({:a => 20}, :safe => true)
-    assert_equal 1, @coll.count
-
-    # Sleep to allow resync
-    sleep(3)
-
-    puts "Please disconnect the current master."
-    gets
-
-    rescue_connection_failure do
-      @coll.insert({:a => 30}, :safe => true)
-    end
-    @coll.insert({:a => 40}, :safe => true)
-    assert_equal 3, @coll.count, "Second count failed"
-  end
-
-end

data/test/replica_pairs/insert_test.rb

@@ -1,50 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require './test/test_helper'
-
-# NOTE: this test should be run only if a replica pair is running.
-class ReplicaPairInsertTest < Test::Unit::TestCase
-  include Mongo
-
-  def setup
-    @conn = Mongo::Connection.new({:left => ["localhost", 27017], :right => ["localhost", 27018]}, nil)
-    @db = @conn.db('mongo-ruby-test')
-    @db.drop_collection("test-pairs")
-    @coll = @db.collection("test-pairs")
-  end
-
-  def test_insert
-    @coll.save({:a => 20}, :safe => true)
-    puts "Please disconnect the current master."
-    gets
-
-    rescue_connection_failure do
-      @coll.save({:a => 30}, :safe => true)
-    end
-
-    @coll.save({:a => 40}, :safe => true)
-    @coll.save({:a => 50}, :safe => true)
-    @coll.save({:a => 60}, :safe => true)
-    @coll.save({:a => 70}, :safe => true)
-
-    puts "Please reconnect the old master to make sure that the new master " +
-         "has synced with the previous master. Note: this may have happened already."
-    gets
-    results = []
-
-    rescue_connection_failure do
-      @coll.find.each {|r| results << r}
-      [20, 30, 40, 50, 60, 70].each do |a|
-        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
-      end
-    end
-
-    @coll.save({:a => 80}, :safe => true)
-    @coll.find.each {|r| results << r}
-    [20, 30, 40, 50, 60, 70, 80].each do |a|
-      assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a} on second find"
-    end
-  end
-
-end

data/test/replica_pairs/pooled_insert_test.rb

@@ -1,54 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'mongo'
-require 'test/unit'
-require './test/test_helper'
-
-# NOTE: this test should be run only if a replica pair is running.
-class ReplicaPairPooledInsertTest < Test::Unit::TestCase
-  include Mongo
-
-  def setup
-    @conn = Mongo::Connection.new({:left => ["localhost", 27017], :right => ["localhost", 27018]}, nil, :pool_size => 10, :timeout => 5)
-    @db = @conn.db('mongo-ruby-test')
-    @db.drop_collection("test-pairs")
-    @coll = @db.collection("test-pairs")
-  end
-
-  def test_insert
-    expected_results = [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-    @coll.save({:a => -1}, :safe => true)
-    puts "Please disconnect the current master."
-    gets
-
-    threads = []
-    10.times do |i|
-      threads[i] = Thread.new do
-        rescue_connection_failure do
-          @coll.save({:a => i}, :safe => true)
-        end
-      end
-    end
-
-    puts "Please reconnect the old master to make sure that the new master " +
-         "has synced with the previous master. Note: this may have happened already." +
-         "Note also that when connection with multiple threads, you may need to wait a few seconds" +
-         "after restarting the old master so that all the data has had a chance to sync." +
-         "This is a case of eventual consistency."
-    gets
-    results = []
-
-    rescue_connection_failure do
-      @coll.find.each {|r| results << r}
-      expected_results.each do |a|
-        assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
-      end
-    end
-
-    @coll.save({:a => 10}, :safe => true)
-    @coll.find.each {|r| results << r}
-    (expected_results + [10]).each do |a|
-      assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a} on second find"
-    end
-  end
-
-end