mongo 1.12.0.rc0 → 1.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c376366d59154151291d12a0a859a6db8850416
-  data.tar.gz: 7d92d814592073a3f2548fea9b2960e241c98502
+  metadata.gz: 5c40b2e0b36d1dab70bbf23b20961b950469a640
+  data.tar.gz: e5c58505d9876a76b88ad649292e2472b78c5d4d
 SHA512:
-  metadata.gz: dc0c717e7741c0871d80af3b6f65be1bd8908a2e0364c6bf17106056f5d71ea4677f410a4cacf0a6ec85181486a2e3eb5392a1b09472c0d728ac9c3dcaecd027
-  data.tar.gz: fd7c88744f849a3cdec1a1e514a2028d4391615028dceb3c48edb0fbe5b6f87a1bceae1745cbc96ad2c0f96f0380897d6f1a9668d4a620adb9d52b0b32c67fe5
+  metadata.gz: e35166ca0624f7b166f2761ee67b166a2c4e7893c317452c529d04e270f03d986b76c22138f5b32546ef5decea0fc4f24fb26bea066ba8bdc6e0245f62727ec4
+  data.tar.gz: 6b49f4cceb3e1ecafe5cbaaa5e0c7a54ae295735e43d9b36cf0ad88d1167165190215468d3eccce6d57d21c9f1e904bec35167af289f2c1590ebb3df44c7b2b9

checksums.yaml.gz.sig

@@ -1,4 +1 @@
-�@�;�����%.*��C��[��K �
-3��2�����:@�/d5'�"��]�:���(w�H�9
-��l�c`�J��J~�MG��8�oQ�%��؁h&nh���I9��*R��|~y�a/��`�Oπ6F+�8�C��_t��h�AQY�Wp
-�W�2���RZ��S;9�����F�y�D�4�0*�� ��#�m����"�R��c��N�R�f���w�X�}����p�S���nj��8��G����'��lf���
+5pj�&:��y�?iˁ����C nܧv1��5Qi;g�d̰+��3���T�r[�l���k����z�nG��g�I�G�(�`�zSI\=%���� ��{���rP@žk3�(N��cP,�H�J-�E������/ b��h�M��>2��z!�x��:uI��=x���}���\62�ٝR��Gh���~�	jT^��Ѭ
�÷���%��Ƣv�6�ǔ����|^����eR���;�+�

data/VERSION

@@ -1 +1 @@
-1.12.0.rc0
+1.12.0.rc1

data/lib/mongo/collection.rb

@@ -550,6 +550,9 @@ module Mongo
     #   The option is silently ignored by the server and unique index builds using the option will
     #   fail if a duplicate value is detected.
     #
+    # @note Note that the options listed may be subset of those available.
+    #   See the MongoDB documentation for a full list of supported options by server version.
+    #
     # @return [String] the name of the index created.
     def create_index(spec, opts={})
       options              = opts.dup
@@ -581,6 +584,9 @@ module Mongo
     #   The option is silently ignored by the server and unique index builds using the option will
     #   fail if a duplicate value is detected.
     #
+    # @note Note that the options listed may be subset of those available.
+    #   See the MongoDB documentation for a full list of supported options by server version.
+    #
     # @return [String] the name of the index.
     def ensure_index(spec, opts={})
       now                  = Time.now.utc.to_i

data/lib/mongo/db.rb

@@ -316,6 +316,9 @@ module Mongo
     #   either we're in +strict+ mode and the collection
     #   already exists or collection creation fails on the server.
     #
+    # @note Note that the options listed may be subset of those available.
+    #   Please see the MongoDB documentation for a full list of supported options by server version.
+    #
     # @return [Mongo::Collection]
     def create_collection(name, opts={})
       name = name.to_s

data/lib/mongo/networking.rb

@@ -86,13 +86,15 @@ module Mongo
         sock = checkout_writer
         send_message_on_socket(packed_message, sock)
         docs, num_received, cursor_id = receive(sock, last_error_id)
-        checkin(sock)
       rescue ConnectionFailure, OperationFailure, OperationTimeout => ex
-        checkin(sock)
         raise ex
       rescue SystemStackError, NoMemoryError, SystemCallError => ex
         close
+        sock = nil
         raise ex
+      ensure
+        checkin(sock) if sock
+        sock = nil
       end
 
       if num_received == 1

data/test/functional/client_test.rb

@@ -452,7 +452,8 @@ class ClientTest < Test::Unit::TestCase
   end
 
   def test_operation_timeout_with_active
-    conn = standard_connection
+    conn = MongoClient.new
+    authenticate_client(conn)
     assert conn.active?
     assert_equal Mongo::MongoClient::DEFAULT_OP_TIMEOUT, conn.op_timeout
 
@@ -518,7 +519,7 @@ class ClientTest < Test::Unit::TestCase
   context "Socket pools" do
     context "checking out writers" do
       setup do
-        @con = standard_connection(:pool_size => 10, :pool_timeout => 10)
+        @con = standard_connection(:pool_size => 10, :pool_timeout => 2)
         @coll = @con[TEST_DB]['test-connection-exceptions']
       end
 
@@ -532,13 +533,42 @@ class ClientTest < Test::Unit::TestCase
         end
       end
 
-      should "close the connection on send_message_with_gle for major exceptions" do
-        @con.stubs(:checkout_writer).raises(SystemStackError)
-        @con.stubs(:checkout_reader).raises(SystemStackError)
-        @con.expects(:close)
-        begin
-          @coll.insert({:foo => "bar"}, :w => 1)
-        rescue SystemStackError
+      context "with GLE" do
+        setup do
+          # Force this connection to use send_message_with_gle for these tests
+          @con.stubs(:use_write_command?).returns(false)
+        end
+
+        should "close the connection on send_message_with_gle for major exceptions" do
+          @con.stubs(:checkout_writer).raises(SystemStackError)
+          @con.stubs(:checkout_reader).raises(SystemStackError)
+          @con.expects(:close)
+          begin
+            @coll.insert({:foo => "bar"}, :w => 1)
+          rescue SystemStackError
+          end
+        end
+
+        should "release the connection on send_message_with_gle for connection exceptions" do
+          mock_writer = mock(:close => true)
+          mock_writer.expects(:read).raises(ConnectionFailure)
+          @con.expects(:send_message_on_socket)
+
+          @con.stubs(:checkout_writer).returns(mock_writer)
+          @con.expects(:checkin).with(mock_writer)
+          @coll.insert({:foo => "bar"}, :w => 1) rescue nil
+        end
+
+        should "release the connection on send_message_with_gle for all exceptions" do
+          mock_writer = mock()
+          mock_writer.expects(:read).raises(ArgumentError)
+          @con.expects(:send_message_on_socket)
+          @con.stubs(:checkout_writer).returns(mock_writer)
+          @con.expects(:checkin).with(mock_writer).once
+          begin
+            @coll.insert({:foo => "bar"}, :w => 1)
+          rescue ArgumentError
+          end
         end
       end
 

data/test/functional/db_test.rb

@@ -65,7 +65,8 @@ class DBTest < Test::Unit::TestCase
 
     db.create_collection(:foo)
     assert db.collection(:foo)
-    assert db.drop_collection(:foo)
+    # Use a string because of SERVER-16260
+    assert db.drop_collection('foo')
   end
 
   def test_logger

data/test/helpers/test_unit.rb

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TEST_HOST     = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost' unless defined? TEST_HOST
-TEST_DATA     = File.join(File.dirname(__FILE__), 'fixtures/data')
-TEST_BASE     = Test::Unit::TestCase
+TEST_HOST       = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost' unless defined? TEST_HOST
+TEST_DATA       = File.join(File.dirname(__FILE__), 'fixtures/data')
+TEST_OP_TIMEOUT = 40
+TEST_BASE       = Test::Unit::TestCase
 
 unless defined? TEST_PORT
   TEST_PORT = if ENV['MONGO_RUBY_DRIVER_PORT']
@@ -89,16 +90,17 @@ class Test::Unit::TestCase
   #
   # @return [MongoClient] The client instance.
   def self.standard_connection(options={}, legacy=false)
+    opts = options[:op_timeout] ? options : options.merge(:op_timeout => TEST_OP_TIMEOUT)
     if legacy
       silently do
         # We have to create the Connection object directly here instead of using TEST_URI
         # because Connection#from_uri ends up creating a MongoClient object.
-        conn = Connection.new(TEST_HOST, TEST_PORT, options)
+        conn = Connection.new(TEST_HOST, TEST_PORT, opts)
         conn[TEST_DB].authenticate(TEST_USER, TEST_USER_PWD)
         conn
       end
     else
-      MongoClient.from_uri(TEST_URI, options)
+      MongoClient.from_uri(TEST_URI, opts)
     end
   end
 
@@ -420,7 +422,7 @@ class Test::Unit::TestCase
     not_cluster = TEST_BASE.class_eval { class_variables }.none? { |v| v =~ /@@cluster_/ }
 
     if @@connected_single_mongod && not_cluster
-      client = Mongo::MongoClient.from_uri(TEST_URI)
+      client = Mongo::MongoClient.from_uri(TEST_URI, :op_timeout => TEST_OP_TIMEOUT)
       db = client[TEST_DB]
       begin
         begin

data/test/replica_set/authentication_test.rb

@@ -28,7 +28,7 @@ class ReplicaSetAuthenticationTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
-    @client    = MongoReplicaSetClient.from_uri(@uri)
+    @client    = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
     @admin     = @client['admin']
     @version   = @client.server_version
     @db        = @client['ruby-test']

data/test/replica_set/basic_test.rb

@@ -21,7 +21,7 @@ class ReplicaSetBasicTest < Test::Unit::TestCase
   end
 
   def test_connect
-    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :name => @rs.repl_set_name)
+    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :name => @rs.repl_set_name, :op_timeout => TEST_OP_TIMEOUT)
     assert client.connected?
     assert_equal @rs.primary_name, client.primary.join(':')
     assert_equal @rs.secondary_names.sort, client.secondaries.collect{|s| s.join(':')}.sort

data/test/replica_set/client_test.rb

@@ -26,7 +26,7 @@ class ReplicaSetClientTest < Test::Unit::TestCase
   end
 
   def test_reconnection
-    @client = MongoReplicaSetClient.from_uri(@uri)
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
     assert @client.connected?
 
     manager = @client.local_manager

data/test/replica_set/count_test.rb

@@ -18,7 +18,7 @@ class ReplicaSetCountTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
-    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :read => :primary_preferred)
+    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :read => :primary_preferred, :op_timeout => TEST_OP_TIMEOUT)
     authenticate_client(@client)
     assert @client.primary_pool
     @primary = MongoClient.new(@client.primary_pool.host, @client.primary_pool.port)

data/test/replica_set/cursor_test.rb

@@ -65,7 +65,7 @@ class ReplicaSetCursorTest < Test::Unit::TestCase
   def setup_client(read=:primary)
     route_read ||= read
     # Setup ReplicaSet Connection
-    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :read => read)
+    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :read => read, :op_timeout => TEST_OP_TIMEOUT)
     authenticate_client(@client)
 
     @db = @client.db(TEST_DB)

data/test/replica_set/insert_test.rb

@@ -18,7 +18,7 @@ class ReplicaSetInsertTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
-    @client = MongoReplicaSetClient.from_uri(@uri)
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
     @version = @client.server_version
     @db = @client.db(TEST_DB)
     @db.drop_collection("test-sets")

data/test/replica_set/max_values_test.rb

@@ -20,7 +20,7 @@ class MaxValuesTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
-    @client = MongoReplicaSetClient.from_uri(@uri)
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
     @db = new_mock_db
     @client.stubs(:[]).returns(@db)
     @ismaster = {

data/test/replica_set/pinning_test.rb

@@ -17,7 +17,7 @@ require 'test_helper'
 class ReplicaSetPinningTest < Test::Unit::TestCase
   def setup
     ensure_cluster(:rs)
-    @client = MongoReplicaSetClient.from_uri(@uri)
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
     @db = @client.db(TEST_DB)
     @coll = @db.collection("test-sets")
     @coll.insert({:a => 1})

data/test/replica_set/query_test.rb

@@ -18,7 +18,7 @@ class ReplicaSetQueryTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
-    @client = MongoReplicaSetClient.from_uri(@uri)
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
     @db = @client.db(TEST_DB)
     @db.drop_collection("test-sets")
     @coll = @db.collection("test-sets")

data/test/replica_set/read_preference_test.rb

@@ -17,66 +17,63 @@ require 'test_helper'
 class ReadPreferenceTest < Test::Unit::TestCase
 
   def setup
-    ensure_cluster(:rs, :replicas => 2, :arbiters => 0)
-
-    # Insert data
-    primary = @rs.primary
-    conn = Connection.new(primary.host, primary.port)
-    authenticate_client(conn)
-    db = conn.db(TEST_DB)
-    coll = db.collection("test-sets")
+    ensure_cluster(:rs)
+    client = make_connection
+    db = client.db(TEST_DB)
+    coll = db.collection('test-sets')
     coll.save({:a => 20}, {:w => 2})
   end
 
   def test_read_primary
-    conn = make_connection
+    client = make_connection
     rescue_connection_failure do
-      assert conn.read_primary?
-      assert conn.primary?
+      assert client.read_primary?
+      assert client.primary?
     end
 
-    conn = make_connection(:primary_preferred)
+    client = make_connection(:primary_preferred)
     rescue_connection_failure do
-      assert conn.read_primary?
-      assert conn.primary?
+      assert client.read_primary?
+      assert client.primary?
     end
 
-    conn = make_connection(:secondary)
+    client = make_connection(:secondary)
     rescue_connection_failure do
-      assert !conn.read_primary?
-      assert !conn.primary?
+      assert !client.read_primary?
+      assert !client.primary?
     end
 
-    conn = make_connection(:secondary_preferred)
+    client = make_connection(:secondary_preferred)
     rescue_connection_failure do
-      assert !conn.read_primary?
-      assert !conn.primary?
+      assert !client.read_primary?
+      assert !client.primary?
     end
   end
 
   def test_connection_pools
-    conn = make_connection
-    assert conn.primary_pool, "No primary pool!"
-    assert conn.read_pool, "No read pool!"
-    assert conn.primary_pool.port == conn.read_pool.port,
+    client = make_connection
+    assert client.primary_pool, "No primary pool!"
+    assert client.read_pool, "No read pool!"
+    assert client.primary_pool.port == client.read_pool.port,
       "Primary port and read port are not the same!"
 
-    conn = make_connection(:primary_preferred)
-    assert conn.primary_pool, "No primary pool!"
-    assert conn.read_pool, "No read pool!"
-    assert conn.primary_pool.port == conn.read_pool.port,
+
+    client = make_connection(:primary_preferred)
+    assert client.primary_pool, "No primary pool!"
+    assert client.read_pool, "No read pool!"
+    assert client.primary_pool.port == client.read_pool.port,
       "Primary port and read port are not the same!"
 
-    conn = make_connection(:secondary)
-    assert conn.primary_pool, "No primary pool!"
-    assert conn.read_pool, "No read pool!"
-    assert conn.primary_pool.port != conn.read_pool.port,
+    client = make_connection(:secondary)
+    assert client.primary_pool, "No primary pool!"
+    assert client.read_pool, "No read pool!"
+    assert client.primary_pool.port != client.read_pool.port,
       "Primary port and read port are the same!"
 
-    conn = make_connection(:secondary_preferred)
-    assert conn.primary_pool, "No primary pool!"
-    assert conn.read_pool, "No read pool!"
-    assert conn.primary_pool.port != conn.read_pool.port,
+    client = make_connection(:secondary_preferred)
+    assert client.primary_pool, "No primary pool!"
+    assert client.read_pool, "No read pool!"
+    assert client.primary_pool.port != client.read_pool.port,
       "Primary port and read port are the same!"
   end
 
@@ -84,97 +81,97 @@ class ReadPreferenceTest < Test::Unit::TestCase
     prepare_routing_test
 
     # Test that reads are going to the right members
-    assert_query_route(@primary, @primary_direct)
-    assert_query_route(@primary_preferred, @primary_direct)
-    assert_query_route(@secondary, @secondary_direct)
-    assert_query_route(@secondary_preferred, @secondary_direct)
+    assert_query_route(@primary, :primary)
+    assert_query_route(@primary_preferred, :primary)
+    assert_query_route(@secondary, :secondary)
+    assert_query_route(@secondary_preferred, :secondary)
   end
 
   def test_read_routing_with_primary_down
     prepare_routing_test
 
     # Test that reads are going to the right members
-    assert_query_route(@primary, @primary_direct)
-    assert_query_route(@primary_preferred, @primary_direct)
-    assert_query_route(@secondary, @secondary_direct)
-    assert_query_route(@secondary_preferred, @secondary_direct)
+    assert_query_route(@primary, :primary)
+    assert_query_route(@primary_preferred, :primary)
+    assert_query_route(@secondary, :secondary)
+    assert_query_route(@secondary_preferred, :secondary)
 
-    # Kill the primary so only a single secondary exists
+    # Kill the primary so the remaining two members are secondaries
     @rs.primary.kill
-
+    sleep(2)
     # Test that reads are going to the right members
     assert_raise_error ConnectionFailure do
       @primary[TEST_DB]['test-sets'].find_one
     end
-    assert_query_route(@primary_preferred, @secondary_direct)
-    assert_query_route(@secondary, @secondary_direct)
-    assert_query_route(@secondary_preferred, @secondary_direct)
+    assert_query_route(@primary_preferred, :secondary)
+    assert_query_route(@secondary, :secondary)
+    assert_query_route(@secondary_preferred, :secondary)
 
     # Restore set
     @rs.restart
     sleep(1)
     @repl_cons.each { |con| con.refresh }
     sleep(1)
-    @primary_direct = Connection.new(
-      @rs.config['host'],
-      @primary.read_pool.port
-    )
 
     # Test that reads are going to the right members
-    assert_query_route(@primary, @primary_direct)
-    assert_query_route(@primary_preferred, @primary_direct)
-    assert_query_route(@secondary, @secondary_direct)
-    assert_query_route(@secondary_preferred, @secondary_direct)
+    assert_query_route(@primary, :primary)
+    assert_query_route(@primary_preferred, :primary)
+    assert_query_route(@secondary, :secondary)
+    assert_query_route(@secondary_preferred, :secondary)
   end
 
   def test_read_routing_with_secondary_down
     prepare_routing_test
 
     # Test that reads are going to the right members
-    assert_query_route(@primary, @primary_direct)
-    assert_query_route(@primary_preferred, @primary_direct)
-    assert_query_route(@secondary, @secondary_direct)
-    assert_query_route(@secondary_preferred, @secondary_direct)
-
-    # Kill the secondary so that only primary exists
-    @rs.secondaries.first.kill
-
-    # Test that reads are going to the right members
-    assert_query_route(@primary, @primary_direct)
-    assert_query_route(@primary_preferred, @primary_direct)
-    assert_raise_error ConnectionFailure do
-      @secondary[TEST_DB]['test-sets'].find_one
+    assert_query_route(@primary, :primary)
+    assert_query_route(@primary_preferred, :primary)
+    assert_query_route(@secondary, :secondary)
+    assert_query_route(@secondary_preferred, :secondary)
+
+    secondaries = @rs.secondaries
+    secondaries[0].kill
+    assert_query_route(@secondary_preferred, :secondary)
+
+    secondaries[1].kill
+    sleep(2)
+
+    recovered = false
+    until recovered
+      begin
+        @secondary[TEST_DB]['test-sets'].find_one
+        recovered = true
+      rescue ConnectionFailure
+      end
     end
-    assert_query_route(@secondary_preferred, @primary_direct)
+
+    assert_query_route(@secondary_preferred, :secondary)
+    assert_query_route(@secondary, :secondary)
+    assert_query_route(@primary_preferred, :secondary)
 
     # Restore set
     @rs.restart
     sleep(1)
     @repl_cons.each { |con| con.refresh }
     sleep(1)
-    @secondary_direct = Connection.new(
-      @rs.config['host'],
-      @secondary.read_pool.port,
-      :slave_ok => true
-    )
 
     # Test that reads are going to the right members
-    assert_query_route(@primary, @primary_direct)
-    assert_query_route(@primary_preferred, @primary_direct)
-    assert_query_route(@secondary, @secondary_direct)
-    assert_query_route(@secondary_preferred, @secondary_direct)
+    assert_query_route(@primary, :primary)
+    assert_query_route(@primary_preferred, :primary)
+    assert_query_route(@secondary, :secondary)
+    assert_query_route(@secondary_preferred, :secondary)
   end
 
   def test_write_lots_of_data
-    @conn = make_connection(:secondary_preferred)
-    @db = @conn[TEST_DB]
-    @coll = @db.collection("test-sets", {:w => 2})
+    client = make_connection(:secondary_preferred)
+    db = client[TEST_DB]
+    coll = db.collection("test-sets", {:w => 2})
 
     6000.times do |n|
-      @coll.save({:a => n})
+      coll.save({:a => n})
     end
 
-    cursor = @coll.find()
+    cursor = coll.find()
     cursor.next
     cursor.close
   end
@@ -189,15 +186,14 @@ class ReadPreferenceTest < Test::Unit::TestCase
     @secondary_preferred = make_connection(:secondary_preferred)
     @repl_cons = [@primary, @primary_preferred, @secondary, @secondary_preferred]
 
-    # Setup direct connections
-    @primary_direct = Connection.new(@rs.config['host'], @primary.read_pool.port)
-    authenticate_client(@primary_direct)
-    @secondary_direct = Connection.new(@rs.config['host'], @secondary.read_pool.port, :slave_ok => true)
-    authenticate_client(@secondary_direct)
+    @repl_cons.each do |client|
+      client.stubs(:pinned_pool).returns(nil)
+    end
   end
 
   def make_connection(mode = :primary, opts = {})
-    opts.merge!({:read => mode})
+    opts.merge!(:read => mode)
+    opts.merge!(:op_timeout => nil)
     client = MongoReplicaSetClient.new(@rs.repl_set_seeds, opts)
     authenticate_client(client)
   end
@@ -206,15 +202,18 @@ class ReadPreferenceTest < Test::Unit::TestCase
     connection['admin'].command({:serverStatus => 1})['opcounters']['query']
   end
 
-  def assert_query_route(test_connection, expected_target)
-    #puts "#{test_connection.read_pool.port} #{expected_target.read_pool.port}"
+  def assert_query_route(test_connection, type)
+    secondary = type == :secondary
     authenticate_client(test_connection)
-    authenticate_client(expected_target)
-    queries_before = query_count(expected_target)
+    cursor = test_connection[TEST_DB]['test-sets'].find
     assert_nothing_raised do
-      test_connection[TEST_DB]['test-sets'].find_one
+      cursor.next
     end
-    queries_after = query_count(expected_target)
-    assert_equal 1, queries_after - queries_before
+    pool = cursor.instance_variable_get("@pool")
+    assert_equal secondary, secondary?(MongoClient.new(pool.host, pool.port))
+  end
+
+  def secondary?(client)
+    client['admin'].command(:isMaster => 1)['secondary']
   end
 end

data/test/replica_set/refresh_test.rb

@@ -22,7 +22,8 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
 
   def test_connect_and_manual_refresh_with_secondary_down
     num_secondaries = @rs.secondaries.size
-    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :refresh_mode => false)
+    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :refresh_mode => false,
+                                       :op_timeout => TEST_OP_TIMEOUT)
     authenticate_client(client)
 
     assert_equal num_secondaries, client.secondaries.size
@@ -57,7 +58,8 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
   def test_automated_refresh_with_secondary_down
     num_secondaries = @rs.secondaries.size
     client = MongoReplicaSetClient.new(@rs.repl_set_seeds,
-      :refresh_interval => 1, :refresh_mode => :sync, :read => :secondary_preferred)
+      :refresh_interval => 1, :refresh_mode => :sync, :read => :secondary_preferred,
+      :op_timeout => TEST_OP_TIMEOUT)
     authenticate_client(client)
 
     # Ensure secondaries are all recognized by client and client is connected
@@ -99,7 +101,8 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     factor = 5
     nthreads = factor * 10
     threads = []
-    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :refresh_mode => :sync, :refresh_interval => 1)
+    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :refresh_mode => :sync,
+                                       :refresh_interval => 1, :op_timeout => TEST_OP_TIMEOUT)
     authenticate_client(client)
 
     nthreads.times do |i|

data/test/replica_set/replication_ack_test.rb

@@ -18,7 +18,7 @@ class ReplicaSetAckTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
-    @client = MongoReplicaSetClient.from_uri(@uri)
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
 
     @slave1 = MongoClient.new(
       @client.secondary_pools.first.host,
@@ -33,7 +33,7 @@ class ReplicaSetAckTest < Test::Unit::TestCase
   end
 
   def teardown
-    @client.close if @conn
+    @client.close if @client
   end
 
   def test_safe_mode_with_w_failure

data/test/tools/mongo_config.rb

@@ -672,6 +672,7 @@ module Mongo
         cmd_servers = replica_set? ? [ primary ] : routers
 
         cmd_servers.each do |cmd_server|
+          next unless cmd_server
           begin
             client = Mongo::MongoClient.new(cmd_server.config[:host],
                                             cmd_server.config[:port])
@@ -690,6 +691,7 @@ module Mongo
       end
 
       def stop
+        start
         delete_users
         servers.each{|server| server.stop}
         self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.12.0.rc0
+  version: 1.12.0.rc1
 platform: ruby
 authors:
 - Emily Stolfo
@@ -34,7 +34,7 @@ cert_chain:
   JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
   9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
   -----END CERTIFICATE-----
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -42,14 +42,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0.rc0
+        version: 1.12.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0.rc0
+        version: 1.12.0.rc1
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables:
@@ -131,7 +131,6 @@ files:
 - test/replica_set/authentication_test.rb
 - test/replica_set/basic_test.rb
 - test/replica_set/client_test.rb
-- test/replica_set/complex_connect_test.rb
 - test/replica_set/connection_test.rb
 - test/replica_set/count_test.rb
 - test/replica_set/cursor_test.rb
@@ -221,7 +220,6 @@ test_files:
 - test/replica_set/authentication_test.rb
 - test/replica_set/basic_test.rb
 - test/replica_set/client_test.rb
-- test/replica_set/complex_connect_test.rb
 - test/replica_set/connection_test.rb
 - test/replica_set/count_test.rb
 - test/replica_set/cursor_test.rb

data/test/replica_set/complex_connect_test.rb

@@ -1,80 +0,0 @@
-# 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.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'test_helper'
-
-class ComplexConnectTest < Test::Unit::TestCase
-
-  def setup
-    ensure_cluster(:rs)
-  end
-
-  def teardown
-    @client.close if defined?(@conn) && @conn
-  end
-
-  def test_complex_connect
-    host = @rs.servers.first.host
-    primary = MongoClient.new(host, @rs.primary.port)
-    authenticate_client(primary)
-
-    @client = MongoReplicaSetClient.new([
-      @rs.servers[2].host_port,
-      @rs.servers[1].host_port,
-      @rs.servers[0].host_port
-    ])
-
-    authenticate_client(@client)
-    version = @client.server_version
-
-    @client[TEST_DB]['complext-connect-test'].insert({:a => 1})
-    assert @client[TEST_DB]['complext-connect-test'].find_one
-
-    config = primary['local']['system.replset'].find_one
-    old_config = config.dup
-    config['version'] += 1
-
-    # eliminate exception: can't find self in new replset config
-    port_to_delete = @rs.servers.collect(&:port).find{|port| port != primary.port}.to_s
-
-    config['members'].delete_if do |member|
-      member['host'].include?(port_to_delete)
-    end
-
-    assert_raise ConnectionFailure do
-      primary['admin'].command({:replSetReconfig => config})
-    end
-    @rs.start
-
-    assert_raise ConnectionFailure do
-      perform_step_down(primary)
-    end
-
-    # isMaster is currently broken in 2.1+ when called on removed nodes
-    puts version
-    if version < "2.1"
-      rescue_connection_failure do
-        assert @client[TEST_DB]['complext-connect-test'].find_one
-      end
-
-      assert @client[TEST_DB]['complext-connect-test'].find_one
-    end
-
-    primary = MongoClient.new(host, @rs.primary.port)
-    authenticate_client(primary)
-    assert_raise ConnectionFailure do
-      primary['admin'].command({:replSetReconfig => old_config})
-    end
-  end
-end