mongo 2.2.7 → 2.3.0

data/spec/mongo/server/connection_spec.rb

@@ -113,7 +113,8 @@ describe Mongo::Server::Connection do
             TEST_OPTIONS.merge(
               :user => 'notauser',
               :password => 'password',
-              :database => TEST_DB )
+              :database => TEST_DB,
+              :heartbeat_frequency => 30)
           )
         end
 
@@ -130,7 +131,6 @@ describe Mongo::Server::Connection do
         end
 
         it 'marks the server as unknown' do
-          pending 'Server must be set as unknown'
           expect(server).to be_unknown
         end
       end
@@ -261,11 +261,11 @@ describe Mongo::Server::Connection do
       end
 
       let(:query_bob) do
-        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { 'name' => 'bob' })
+        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { name: 'bob' })
       end
 
       let(:query_alice) do
-        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { 'name' => 'alice' })
+        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { name: 'alice' })
       end
 
       after do
@@ -278,14 +278,14 @@ describe Mongo::Server::Connection do
         connection.dispatch([ insert, query_bob ])
       end
 
-      it 'raises an UnexpectedResponse' do
+      it 'raises an UnexpectedResponse error' do
         expect {
           connection.dispatch([ query_alice ])
         }.to raise_error(Mongo::Error::UnexpectedResponse,
           /Got response for request ID \d+ but expected response for request ID \d+/)
       end
 
-      it "doesn't break subsequent requests" do
+      it 'does not affect subsequent requests' do
         expect {
           connection.dispatch([ query_alice ])
         }.to raise_error(Mongo::Error::UnexpectedResponse)
@@ -294,7 +294,7 @@ describe Mongo::Server::Connection do
       end
     end
 
-    context 'when a request is brutaly interrupted (Thread.kill)' do
+    context 'when a request is interrupted (Thread.kill)' do
 
       let(:documents) do
         [{ 'name' => 'bob' }, { 'name' => 'alice' }]
@@ -305,11 +305,11 @@ describe Mongo::Server::Connection do
       end
 
       let(:query_bob) do
-        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { 'name' => 'bob' })
+        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { name: 'bob' })
       end
 
       let(:query_alice) do
-        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { 'name' => 'alice' })
+        Mongo::Protocol::Query.new(TEST_DB, TEST_COLL, { name: 'alice' })
       end
 
       before do
@@ -320,7 +320,7 @@ describe Mongo::Server::Connection do
         authorized_collection.delete_many
       end
 
-      it "closes the socket and does not use it for subsequent requests" do
+      it 'closes the socket and does not use it for subsequent requests' do
         t = Thread.new {
           # Kill the thread just before the reply is read
           allow(Mongo::Protocol::Reply).to receive(:deserialize_header) { t.kill }
@@ -332,7 +332,6 @@ describe Mongo::Server::Connection do
       end
     end
 
-
     context 'when the message exceeds the max size' do
 
       context 'when the message is an insert' do
@@ -547,9 +546,6 @@ describe Mongo::Server::Connection do
 
     before do
       connection.connect!
-      socket = connection.instance_variable_get(:@socket)
-      max_message_size = connection.send(:max_message_size)
-      allow(Mongo::Protocol::Reply).to receive(:deserialize).with(socket, max_message_size).and_return(reply)
     end
 
     context 'when the ismaster response indicates the auth mechanism is :scram' do
@@ -565,6 +561,9 @@ describe Mongo::Server::Connection do
       context 'when the server auth mechanism is scram', if: scram_sha_1_enabled? do
 
         it 'uses scram' do
+          socket = connection.instance_variable_get(:@socket)
+          max_message_size = connection.send(:max_message_size)
+          allow(Mongo::Protocol::Reply).to receive(:deserialize).with(socket, max_message_size).and_return(reply)
           expect(connection.send(:default_mechanism)).to eq(:scram)
         end
       end
@@ -572,6 +571,9 @@ describe Mongo::Server::Connection do
       context 'when the server auth mechanism is the default (mongodb_cr)', unless: scram_sha_1_enabled?  do
 
         it 'uses scram' do
+          socket = connection.instance_variable_get(:@socket)
+          max_message_size = connection.send(:max_message_size)
+          allow(Mongo::Protocol::Reply).to receive(:deserialize).with(socket, max_message_size).and_return(reply)
           expect(connection.send(:default_mechanism)).to eq(:scram)
         end
       end
@@ -590,6 +592,9 @@ describe Mongo::Server::Connection do
       context 'when the server auth mechanism is scram', if: scram_sha_1_enabled? do
 
         it 'uses scram' do
+          socket = connection.instance_variable_get(:@socket)
+          max_message_size = connection.send(:max_message_size)
+          allow(Mongo::Protocol::Reply).to receive(:deserialize).with(socket, max_message_size).and_return(reply)
           expect(connection.send(:default_mechanism)).to eq(:scram)
         end
       end
@@ -597,6 +602,9 @@ describe Mongo::Server::Connection do
       context 'when the server auth mechanism is the default (mongodb_cr)', unless: scram_sha_1_enabled?  do
 
         it 'uses mongodb_cr' do
+          socket = connection.instance_variable_get(:@socket)
+          max_message_size = connection.send(:max_message_size)
+          allow(Mongo::Protocol::Reply).to receive(:deserialize).with(socket, max_message_size).and_return(reply)
           expect(connection.send(:default_mechanism)).to eq(:mongodb_cr)
         end
       end

data/spec/mongo/server_selection_spec.rb

@@ -57,12 +57,12 @@ describe 'Server Selection' do
 
       let(:server_selector) do
         Mongo::ServerSelector.get(:mode => spec.read_preference['mode'],
-                                  :tag_sets => spec.read_preference['tag_sets'],
-                                  :server_selection_timeout => 1)
+                                  :tag_sets => spec.read_preference['tag_sets'])
       end
 
       before do
         allow(cluster).to receive(:servers).and_return(candidate_servers)
+        allow(cluster).to receive(:options).and_return(server_selection_timeout: 0.2)
         allow(cluster).to receive(:scan!).and_return(true)
       end
 

data/spec/mongo/server_selector/nearest_spec.rb

@@ -85,10 +85,10 @@ describe Mongo::ServerSelector::Nearest do
     context 'tag sets provided' do
       let(:tag_sets) { [tag_set] }
       let(:matching_primary) do
-        server(:primary, :tags => server_tags, address: default_address)
+        make_server(:primary, :tags => server_tags, address: default_address)
       end
       let(:matching_secondary) do
-        server(:secondary, :tags => server_tags, address: default_address)
+        make_server(:secondary, :tags => server_tags, address: default_address)
       end
 
       context 'single candidate' do
@@ -173,8 +173,8 @@ describe Mongo::ServerSelector::Nearest do
     end
 
     context 'high latency servers' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 113, address: default_address) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 114, address: default_address) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 113, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 114, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -81,11 +81,11 @@ describe Mongo::ServerSelector::PrimaryPreferred do
       let(:tag_sets) { [tag_set] }
 
       let(:matching_primary) do
-        server(:primary, :tags => server_tags, address: default_address )
+        make_server(:primary, :tags => server_tags, address: default_address )
       end
 
       let(:matching_secondary) do
-        server(:secondary, :tags => server_tags, address: default_address )
+        make_server(:secondary, :tags => server_tags, address: default_address )
       end
 
       context 'single candidate' do
@@ -171,8 +171,8 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     end
 
     context 'high latency servers' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 100, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 113, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/primary_spec.rb

@@ -76,8 +76,8 @@ describe Mongo::ServerSelector::Primary do
     end
 
     context 'high latency candidates' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 120, address: default_address) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 100, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 120, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -87,11 +87,11 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       end
 
       let(:matching_primary) do
-        server(:primary, :tags => server_tags, address: default_address)
+        make_server(:primary, :tags => server_tags, address: default_address)
       end
 
       let(:matching_secondary) do
-        server(:secondary, :tags => server_tags, address: default_address)
+        make_server(:secondary, :tags => server_tags, address: default_address)
       end
 
       context 'single candidate' do
@@ -170,8 +170,8 @@ describe Mongo::ServerSelector::SecondaryPreferred do
     end
 
     context 'high latency servers' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 100, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 113, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/secondary_spec.rb

@@ -76,7 +76,7 @@ describe Mongo::ServerSelector::Secondary do
 
     context 'tag sets provided' do
       let(:tag_sets) { [tag_set] }
-      let(:matching_secondary) { server(:secondary, :tags => server_tags, address: default_address) }
+      let(:matching_secondary) { make_server(:secondary, :tags => server_tags, address: default_address) }
 
       context 'single candidate' do
 
@@ -134,8 +134,8 @@ describe Mongo::ServerSelector::Secondary do
     end
 
     context 'high latency servers' do
-      let(:far_primary) { server(:primary, :average_round_trip_time => 100, address: default_address) }
-      let(:far_secondary) { server(:secondary, :average_round_trip_time => 113, address: default_address) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 100, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 113, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector_spec.rb

@@ -10,6 +10,17 @@ describe Mongo::ServerSelector do
       described_class.get(:mode => name, :tag_sets => tag_sets)
     end
 
+    context 'when a server selector object is passed' do
+
+      let(:name) do
+        :primary
+      end
+
+      it 'returns the object' do
+        expect(described_class.get(selector)).to be(selector)
+      end
+    end
+
     context 'when the mode is primary' do
 
       let(:name) do
@@ -134,7 +145,7 @@ describe Mongo::ServerSelector do
     context 'when #select returns a list of nils' do
 
       let(:servers) do
-        [ server(:primary) ]
+        [ make_server(:primary) ]
       end
 
       let(:cluster) do
@@ -143,11 +154,12 @@ describe Mongo::ServerSelector do
           allow(c).to receive(:single?).and_return(false)
           allow(c).to receive(:sharded?).and_return(false)
           allow(c).to receive(:scan!).and_return(true)
+          allow(c).to receive(:options).and_return(server_selection_timeout: 0.1)
         end
       end
 
       let(:read_pref) do
-        described_class.get(mode: :primary, server_selection_timeout: 0.1).tap do |pref|
+        described_class.get(mode: :primary).tap do |pref|
           allow(pref).to receive(:select).and_return([ nil, nil ])
         end
       end
@@ -158,6 +170,72 @@ describe Mongo::ServerSelector do
         end.to raise_exception(Mongo::Error::NoServerAvailable)
       end
     end
+
+    context 'when the cluster has a server_selection_timeout set' do
+
+      let(:servers) do
+        [ make_server(:secondary), make_server(:primary) ]
+      end
+
+      let(:cluster) do
+        double('cluster').tap do |c|
+          allow(c).to receive(:servers).and_return(servers)
+          allow(c).to receive(:single?).and_return(false)
+          allow(c).to receive(:sharded?).and_return(false)
+          allow(c).to receive(:scan!).and_return(true)
+          allow(c).to receive(:options).and_return(server_selection_timeout: 0)
+        end
+      end
+
+      let(:read_pref) do
+        described_class.get(mode: :nearest)
+      end
+
+      it 'uses the server_selection_timeout of the cluster' do
+        expect{
+          read_pref.select_server(cluster)
+        }.to raise_exception(Mongo::Error::NoServerAvailable)
+      end
+    end
+
+    context 'when the cluster has a local_threshold set' do
+
+      let(:near_server) do
+        make_server(:secondary).tap do |s|
+          allow(s).to receive(:connectable?).and_return(true)
+          allow(s).to receive(:average_round_trip_time).and_return(100)
+        end
+      end
+
+      let(:far_server) do
+        make_server(:secondary).tap do |s|
+          allow(s).to receive(:connectable?).and_return(true)
+          allow(s).to receive(:average_round_trip_time).and_return(200)
+        end
+      end
+
+      let(:servers) do
+        [ near_server, far_server ]
+      end
+
+      let(:cluster) do
+        double('cluster').tap do |c|
+          allow(c).to receive(:servers).and_return(servers)
+          allow(c).to receive(:single?).and_return(false)
+          allow(c).to receive(:sharded?).and_return(false)
+          allow(c).to receive(:scan!).and_return(true)
+          allow(c).to receive(:options).and_return(local_threshold: 0.050)
+        end
+      end
+
+      let(:read_pref) do
+        described_class.get(mode: :nearest)
+      end
+
+      it 'uses the local_threshold of the cluster' do
+        expect(read_pref.select_server(cluster)).to eq(near_server)
+      end
+    end
   end
 
   shared_context 'a ServerSelector' do
@@ -174,11 +252,12 @@ describe Mongo::ServerSelector do
           allow(c).to receive(:single?).and_return(single)
           allow(c).to receive(:sharded?).and_return(sharded)
           allow(c).to receive(:scan!).and_return(true)
+          allow(c).to receive(:options).and_return(server_selection_timeout: 0.1)
         end
       end
 
       let(:read_pref) do
-        described_class.get(mode: :primary, server_selection_timeout: 0.1)
+        described_class.get(mode: :primary)
       end
 
       it 'raises a NoServerAvailable error' do

data/spec/mongo/server_spec.rb

@@ -116,26 +116,6 @@ describe Mongo::Server do
     end
   end
 
-  describe '#context' do
-
-    let(:server) do
-      described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
-    end
-
-    let(:context) do
-      server.context
-    end
-
-    after do
-      expect(cluster).to receive(:pool).with(server).and_return(pool)
-      server.disconnect!
-    end
-
-    it 'returns a new server context' do
-      expect(context.server).to eq(server)
-    end
-  end
-
   describe '#disconnect!' do
 
     let(:server) do

data/spec/support/command_monitoring.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/spec/support/connection_string.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/spec/support/crud.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/spec/support/crud/read.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/spec/support/crud/write.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
+# Copyright (C) 2014-2016 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/spec/support/gridfs.rb

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