mongo 2.4.0.rc1 → 2.4.0

data/spec/mongo/sdam_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe 'Server Discovery and Monitoring' do
+  include Mongo::SDAM
+
+  SERVER_DISCOVERY_TESTS.each do |file|
+
+    spec = Mongo::SDAM::Spec.new(file)
+
+    context(spec.description) do
+
+      before(:all) do
+        Mongo::Client.new(spec.uri_string).tap do |client|
+          @client = client.with(connect_timeout: 0.1, heartbeat_frequency: 100)
+        end.close
+      end
+
+      after(:all) do
+        @client.close
+      end
+
+      spec.phases.each_with_index do |phase, index|
+
+        context("Phase: #{index + 1}") do
+
+          before(:all) do
+            phase.responses.each do |response|
+              server = find_server(@client, response.address)
+              server ||= Mongo::Server.new(
+                  Mongo::Address.new(response.address),
+                  @client.cluster,
+                  @client.instance_variable_get(:@monitoring),
+                  @client.cluster.send(:event_listeners),
+                  @client.cluster.options
+              )
+              monitor = server.instance_variable_get(:@monitor)
+              description = monitor.inspector.run(server.description, response.ismaster, 0.5)
+              monitor.instance_variable_set(:@description, description)
+            end
+          end
+
+          let(:cluster_addresses) do
+            @client.cluster.instance_variable_get(:@servers).
+                collect(&:address).collect(&:to_s).uniq.sort
+          end
+
+          let(:phase_addresses) do
+            phase.outcome.servers.keys.sort
+          end
+
+          it "sets the cluster topology to #{phase.outcome.topology_type}" do
+            expect(@client.cluster).to be_topology(phase.outcome.topology_type)
+          end
+
+          it "sets the cluster replica set name to #{phase.outcome.set_name.inspect}" do
+            expect(@client.cluster.replica_set_name).to eq(phase.outcome.set_name)
+          end
+
+          it "has the expected servers in the cluster" do
+            expect(cluster_addresses).to eq(phase_addresses)
+          end
+
+          phase.outcome.servers.each do |uri, server|
+
+            it "sets #{uri} to #{server['type']}" do
+              expect(find_server(@client, uri)).to be_server_type(server['type'])
+            end
+
+            it "sets #{uri} replica set name to #{server['setName'].inspect}" do
+              expect(find_server(@client, uri).replica_set_name).to eq(server['setName'])
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/mongo/server/connection_pool_spec.rb

@@ -11,15 +11,20 @@ describe Mongo::Server::ConnectionPool do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
   let(:listeners) do
     Mongo::Event::Listeners.new
   end
 
+  let(:topology) do
+    double('topology')
+  end
+
   let(:cluster) do
     double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
       allow(cl).to receive(:app_metadata).and_return(app_metadata)
     end
   end

data/spec/mongo/server/connection_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Server::Connection do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
   let(:listeners) do
@@ -20,10 +20,15 @@ describe Mongo::Server::Connection do
 
   let(:cluster) do
     double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
       allow(cl).to receive(:app_metadata).and_return(app_metadata)
     end
   end
 
+  let(:topology) do
+    double('topology')
+  end
+
   let(:server) do
     Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
   end

data/spec/mongo/server/description_spec.rb

@@ -32,11 +32,16 @@ describe Mongo::Server::Description do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
+  let(:topology) do
+    double('topology')
+  end
+  
   let(:cluster) do
     double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
       allow(cl).to receive(:app_metadata).and_return(app_metadata)
     end
   end
@@ -546,6 +551,90 @@ describe Mongo::Server::Description do
     end
   end
 
+  describe '#server_type' do
+
+    context 'when the server is an arbiter' do
+
+      let(:description) do
+        described_class.new(address, { 'arbiterOnly' => true, 'setName' => 'test' })
+      end
+
+      it 'returns :arbiter' do
+        expect(description.server_type).to eq(:arbiter)
+      end
+    end
+
+    context 'when the server is a ghost' do
+
+      let(:description) do
+        described_class.new(address, { 'isreplicaset' => true })
+      end
+
+      it 'returns :ghost' do
+        expect(description.server_type).to eq(:ghost)
+      end
+    end
+
+    context 'when the server is a mongos' do
+
+      let(:config) do
+        { 'msg' => 'isdbgrid', 'ismaster' => true }
+      end
+
+      let(:description) do
+        described_class.new(address, config)
+      end
+
+      it 'returns :sharded' do
+        expect(description.server_type).to eq(:sharded)
+      end
+    end
+
+    context 'when the server is a primary' do
+
+      let(:description) do
+        described_class.new(address, replica)
+      end
+
+      it 'returns :primary' do
+        expect(description.server_type).to eq(:primary)
+      end
+    end
+
+    context 'when the server is a secondary' do
+
+      let(:description) do
+        described_class.new(address, { 'secondary' => true, 'setName' => 'test' })
+      end
+
+      it 'returns :secondary' do
+        expect(description.server_type).to eq(:secondary)
+      end
+    end
+
+    context 'when the server is standalone' do
+
+      let(:description) do
+        described_class.new(address, { 'ismaster' => true, 'ok' => 1 })
+      end
+
+      it 'returns :standalone' do
+        expect(description.server_type).to eq(:standalone)
+      end
+    end
+
+    context 'when the description has no configuration' do
+
+      let(:description) do
+        described_class.new(address)
+      end
+
+      it 'returns :unknown' do
+        expect(description.server_type).to eq(:unknown)
+      end
+    end
+  end
+
   describe '#unknown?' do
 
     context 'when the description has no configuration' do

data/spec/mongo/server_selection_spec.rb

@@ -10,12 +10,12 @@ describe 'Server Selection' do
 
     context(spec.description) do
 
-      let(:topology) do
-        spec.type.new({})
+      let(:monitoring) do
+        Mongo::Monitoring.new(monitoring: false)
       end
 
-      let(:monitoring) do
-        Mongo::Monitoring.new
+      let(:topology) do
+        spec.type.new({}, monitoring)
       end
 
       let(:listeners) do
@@ -28,6 +28,7 @@ describe 'Server Selection' do
           allow(c).to receive(:single?).and_return(topology.single?)
           allow(c).to receive(:sharded?).and_return(topology.sharded?)
           allow(c).to receive(:replica_set?).and_return(topology.replica_set?)
+          allow(c).to receive(:unknown?).and_return(topology.unknown?)
           allow(c).to receive(:app_metadata).and_return(app_metadata)
         end
       end
@@ -36,7 +37,7 @@ describe 'Server Selection' do
         spec.candidate_servers.collect do |server|
           address = Mongo::Address.new(server['address'])
           Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS).tap do |s|
-            allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
+            allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'] / 1000.0)
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
             allow(s).to receive(:primary?).and_return(server['type'] == 'RSPrimary')
@@ -49,7 +50,7 @@ describe 'Server Selection' do
         spec.in_latency_window.collect do |server|
           address = Mongo::Address.new(server['address'])
           Mongo::Server.new(address, cluster, monitoring, listeners, TEST_OPTIONS).tap do |s|
-            allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
+            allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'] / 1000.0)
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:connectable?).and_return(true)
           end

data/spec/mongo/server_selector/nearest_spec.rb

@@ -18,7 +18,7 @@ describe Mongo::ServerSelector::Nearest do
     context 'when max_staleness is provided' do
 
       let(:options) do
-        { max_staleness: 60 }
+        { max_staleness: 95 }
       end
 
       it 'sets the max_staleness option' do
@@ -32,7 +32,7 @@ describe Mongo::ServerSelector::Nearest do
     context 'when max staleness is the same' do
 
       let(:options) do
-        { max_staleness: 60 }
+        { max_staleness: 95 }
       end
 
       let(:other) do
@@ -47,7 +47,7 @@ describe Mongo::ServerSelector::Nearest do
     context 'when max staleness is different' do
 
       let(:other_options) do
-        { max_staleness: 30 }
+        { max_staleness: 100 }
       end
 
       let(:other) do
@@ -100,11 +100,11 @@ describe Mongo::ServerSelector::Nearest do
     context 'max staleness provided' do
 
       let(:max_staleness) do
-        60
+        100
       end
 
       let(:expected) do
-        { :mode => 'nearest', maxStalenessMS: 60000 }
+        { :mode => 'nearest', maxStalenessSeconds: 100 }
       end
 
       it 'returns a read preference formatted for mongos' do
@@ -246,8 +246,8 @@ describe Mongo::ServerSelector::Nearest do
     end
 
     context 'high latency servers' do
-      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) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 0.113, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 0.114, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/primary_preferred_spec.rb

@@ -18,7 +18,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     context 'when max_staleness is provided' do
 
       let(:options) do
-        { max_staleness: 60 }
+        { max_staleness: 95 }
       end
 
       it 'sets the max_staleness option' do
@@ -32,7 +32,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     context 'when max staleness is the same' do
 
       let(:options) do
-        { max_staleness: 60 }
+        { max_staleness: 95 }
       end
 
       let(:other) do
@@ -47,7 +47,7 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     context 'when max staleness is different' do
 
       let(:other_options) do
-        { max_staleness: 30 }
+        { max_staleness: 100 }
       end
 
       let(:other) do
@@ -93,11 +93,11 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     context 'max staleness provided' do
 
       let(:max_staleness) do
-        60
+        100
       end
 
       let(:expected) do
-        { :mode => 'primaryPreferred', maxStalenessMS: 60000 }
+        { :mode => 'primaryPreferred', maxStalenessSeconds: 100 }
       end
 
       it 'returns a read preference formatted for mongos' do
@@ -244,8 +244,8 @@ describe Mongo::ServerSelector::PrimaryPreferred do
     end
 
     context 'high latency servers' do
-      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) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 0.100, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 0.113, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/primary_spec.rb

@@ -16,7 +16,7 @@ describe Mongo::ServerSelector::Primary do
     context 'when max_staleness is provided' do
 
       let(:options) do
-        { max_staleness: 60 }
+        { max_staleness: 100 }
       end
 
       it 'raises an exception' do
@@ -66,7 +66,7 @@ describe Mongo::ServerSelector::Primary do
     context 'max staleness provided' do
 
       let(:max_staleness) do
-        60
+        100
       end
 
       it 'raises an error' do
@@ -112,8 +112,8 @@ describe Mongo::ServerSelector::Primary do
     end
 
     context 'high latency candidates' do
-      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) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 0.100, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 0.120, address: default_address) }
 
       context 'single candidate' do
 

data/spec/mongo/server_selector/secondary_preferred_spec.rb

@@ -18,7 +18,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
     context 'when max_staleness is provided' do
 
       let(:options) do
-        { max_staleness: 60 }
+        { max_staleness: 95 }
       end
 
       it 'sets the max_staleness option' do
@@ -32,7 +32,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
     context 'when max staleness is the same' do
 
       let(:options) do
-        { max_staleness: 60 }
+        { max_staleness: 90 }
       end
 
       let(:other) do
@@ -47,7 +47,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
     context 'when max staleness is different' do
 
       let(:other_options) do
-        { max_staleness: 30 }
+        { max_staleness: 100 }
       end
 
       let(:other) do
@@ -100,7 +100,7 @@ describe Mongo::ServerSelector::SecondaryPreferred do
       end
 
       let(:expected) do
-        { :mode => 'secondaryPreferred', maxStalenessMS: 60000 }
+        { :mode => 'secondaryPreferred', maxStalenessSeconds: 60 }
       end
 
       it 'returns a read preference formatted for mongos' do
@@ -243,8 +243,8 @@ describe Mongo::ServerSelector::SecondaryPreferred do
     end
 
     context 'high latency servers' do
-      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) }
+      let(:far_primary) { make_server(:primary, :average_round_trip_time => 0.100, address: default_address) }
+      let(:far_secondary) { make_server(:secondary, :average_round_trip_time => 0.113, address: default_address) }
 
       context 'single candidate' do