mongo 2.4.0.rc1 → 2.4.0

data/spec/mongo/server_selector/secondary_spec.rb

@@ -18,7 +18,7 @@ describe Mongo::ServerSelector::Secondary do
     context 'when max_staleness is provided' do
 
       let(:options) do
-        { max_staleness: 60 }
+        { max_staleness: 100 }
       end
 
       it 'sets the max_staleness option' do
@@ -32,7 +32,7 @@ describe Mongo::ServerSelector::Secondary 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::Secondary do
     context 'when max staleness is different' do
 
       let(:other_options) do
-        { max_staleness: 30 }
+        { max_staleness: 95 }
       end
 
       let(:other) do
@@ -96,7 +96,7 @@ describe Mongo::ServerSelector::Secondary do
       end
 
       let(:expected) do
-        { :mode => 'secondary', maxStalenessMS: 60000 }
+        { :mode => 'secondary', maxStalenessSeconds: 60 }
       end
 
       it 'returns a read preference formatted for mongos' do
@@ -207,8 +207,8 @@ describe Mongo::ServerSelector::Secondary 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_spec.rb

@@ -150,9 +150,11 @@ describe Mongo::ServerSelector do
 
       let(:cluster) do
         double('cluster').tap do |c|
+          allow(c).to receive(:topology).and_return(topology)
           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(:unknown?).and_return(false)
           allow(c).to receive(:scan!).and_return(true)
           allow(c).to receive(:options).and_return(server_selection_timeout: 0.1)
         end
@@ -179,9 +181,11 @@ describe Mongo::ServerSelector do
 
       let(:cluster) do
         double('cluster').tap do |c|
+          allow(c).to receive(:topology).and_return(topology)
           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(:unknown?).and_return(false)
           allow(c).to receive(:scan!).and_return(true)
           allow(c).to receive(:options).and_return(server_selection_timeout: 0)
         end
@@ -220,9 +224,11 @@ describe Mongo::ServerSelector do
 
       let(:cluster) do
         double('cluster').tap do |c|
+          allow(c).to receive(:topology).and_return(topology)
           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(:unknown?).and_return(false)
           allow(c).to receive(:scan!).and_return(true)
           allow(c).to receive(:options).and_return(local_threshold: 0.050)
         end
@@ -248,9 +254,11 @@ describe Mongo::ServerSelector do
 
       let(:cluster) do
         double('cluster').tap do |c|
+          allow(c).to receive(:topology).and_return(topology)
           allow(c).to receive(:servers).and_return(servers)
           allow(c).to receive(:single?).and_return(single)
           allow(c).to receive(:sharded?).and_return(sharded)
+          allow(c).to receive(:unknown?).and_return(false)
           allow(c).to receive(:scan!).and_return(true)
           allow(c).to receive(:options).and_return(server_selection_timeout: 0.1)
         end

data/spec/mongo/server_spec.rb

@@ -2,8 +2,13 @@ require 'spec_helper'
 
 describe Mongo::Server do
 
+  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
@@ -13,7 +18,7 @@ describe Mongo::Server do
   end
 
   let(:monitoring) do
-    Mongo::Monitoring.new
+    Mongo::Monitoring.new(monitoring: false)
   end
 
   let(:address) do

data/spec/mongo/uri_spec.rb

@@ -541,7 +541,7 @@ describe Mongo::URI do
     context 'read preference max staleness option provided' do
 
       let(:options) do
-        'readPreference=Secondary&maxStalenessMS=120000'
+        'readPreference=Secondary&maxStalenessSeconds=120'
       end
 
       let(:read) do
@@ -561,7 +561,7 @@ describe Mongo::URI do
         context 'when max staleness is combined with read preference mode primary' do
 
           let(:options) do
-            'readPreference=primary&maxStalenessMS=120000'
+            'readPreference=primary&maxStalenessSeconds=120'
           end
 
           it 'raises an exception when read preference is accessed on the client' do
@@ -571,10 +571,10 @@ describe Mongo::URI do
           end
         end
 
-        context 'when the max staleness value is not at least twice heartbeat frequency' do
+        context 'when the max staleness value is too small' do
 
           let(:options) do
-            'readPreference=secondary&maxStalenessMS=1'
+            'readPreference=secondary&maxStalenessSeconds=89'
           end
 
           it 'does not raise an exception until the read preference is used' do

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ TEST_SET = 'ruby-driver-rs'
 COVERAGE_MIN = 90
 CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
 SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/support/sdam/**/*.yml")
+SDAM_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/support/sdam_monitoring/*.yml")
 SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/rtt/*.yml")
 SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/selection/**/*.yml")
 MAX_STALENESS_TESTS = Dir.glob("#{CURRENT_PATH}/support/max_staleness/**/*.yml")
@@ -31,6 +32,7 @@ require 'support/authorization'
 require 'support/server_discovery_and_monitoring'
 require 'support/server_selection_rtt'
 require 'support/server_selection'
+require 'support/sdam_monitoring'
 require 'support/crud'
 require 'support/command_monitoring'
 require 'support/connection_string'

data/spec/support/max_staleness/ReplicaSetNoPrimary/Incompatible.yml

@@ -1,6 +1,6 @@
-# During server selection,
-# clients (drivers or mongos) MUST raise an error if ``maxStalenessMS`` is not zero or null,
-# and any server's ``maxWireVersion`` is less than 5 (`SERVER-23893`_).
+# During server selection, clients (drivers or mongos) MUST raise an error if
+# maxStalenessSeconds is defined and not -1 and any server's ``maxWireVersion``
+# is less than 5 (`SERVER-23893`_).
 ---
 topology_description:
   type: ReplicaSetNoPrimary
@@ -21,5 +21,5 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 120000
+  maxStalenessSeconds: 120
 error: true

data/spec/support/max_staleness/ReplicaSetNoPrimary/LastUpdateTime.yml

@@ -7,14 +7,14 @@ topology_description:
     type: RSSecondary
     avg_rtt_ms: 5
     lastUpdateTime: 1
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     maxWireVersion: 5
   - &2
     address: b:27017
     type: RSSecondary
     avg_rtt_ms: 50  # Too far.
     lastUpdateTime: 25002  # Not used when there's no primary.
-    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 25 sec stale + 25 sec heartbeat <= 50 sec maxStaleness.
+    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness.
     maxWireVersion: 5
   - &3
     address: c:27017
@@ -25,7 +25,7 @@ topology_description:
     maxWireVersion: 5
 read_preference:
   mode: Nearest
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
 suitable_servers:
 - *1
 - *2

data/spec/support/max_staleness/ReplicaSetNoPrimary/Nearest.yml

@@ -7,14 +7,14 @@ topology_description:
     type: RSSecondary
     avg_rtt_ms: 5
     lastUpdateTime: 0
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     maxWireVersion: 5
   - &2
     address: b:27017
     type: RSSecondary
     avg_rtt_ms: 50  # Too far.
     lastUpdateTime: 0
-    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 25 sec stale + 25 sec heartbeat <= 50 sec maxStaleness.
+    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness.
     maxWireVersion: 5
   - &3
     address: c:27017
@@ -25,7 +25,7 @@ topology_description:
     maxWireVersion: 5
 read_preference:
   mode: Nearest
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
 suitable_servers:
 - *1
 - *2

data/spec/support/max_staleness/ReplicaSetNoPrimary/Nearest2.yml

@@ -7,14 +7,14 @@ topology_description:
     type: RSSecondary
     avg_rtt_ms: 50  # Too far.
     lastUpdateTime: 0
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     maxWireVersion: 5
   - &2
     address: b:27017
     type: RSSecondary
     avg_rtt_ms: 5
     lastUpdateTime: 0
-    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 25 sec stale + 25 sec heartbeat <= 50 sec maxStaleness.
+    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness.
     maxWireVersion: 5
   - &3
     address: c:27017
@@ -25,7 +25,7 @@ topology_description:
     maxWireVersion: 5
 read_preference:
   mode: Nearest
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
 suitable_servers:
 - *1
 - *2

data/spec/support/max_staleness/ReplicaSetNoPrimary/NoKnownServers.yml

@@ -0,0 +1,15 @@
+# maxStalenessSeconds must be at least 90 seconds, even with no known servers.
+---
+topology_description:
+  type: ReplicaSetNoPrimary
+  servers:
+  - &1
+    address: a:27017
+    type: Unknown
+  - &2
+    address: b:27017
+    type: Unknown
+read_preference:
+  mode: Nearest
+  maxStalenessSeconds: 1  # Too small.
+error: true

data/spec/support/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml

@@ -20,7 +20,7 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}  # Very stale.
 read_preference:
   mode: PrimaryPreferred
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 90
 suitable_servers:
 - *1
 in_latency_window:

data/spec/support/max_staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml

@@ -1,4 +1,4 @@
-# maxStalenessMS is applied before tag sets. With tag sets
+# maxStalenessSeconds is applied before tag sets. With tag sets
 # [{data_center: nyc}, {data_center: tokyo}], if the only node in NYC is stale
 # then use Tokyo.
 ---
@@ -11,7 +11,7 @@ topology_description:
     type: RSSecondary
     avg_rtt_ms: 5
     lastUpdateTime: 0
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     maxWireVersion: 5
     tags:
       data_center: tokyo  # Matches second tag set.
@@ -26,7 +26,7 @@ topology_description:
       data_center: nyc
 read_preference:
   mode: PrimaryPreferred
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
   tag_sets:
   - data_center: nyc
   - data_center: tokyo

data/spec/support/max_staleness/ReplicaSetNoPrimary/Secondary.yml

@@ -10,7 +10,7 @@ topology_description:
     avg_rtt_ms: 5
     lastUpdateTime: 0
     maxWireVersion: 5
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     tags:
       data_center: tokyo  # No match, but its lastWriteDate is used in estimate.
   - &2
@@ -19,7 +19,7 @@ topology_description:
     avg_rtt_ms: 5
     lastUpdateTime: 0
     maxWireVersion: 5
-    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 25 sec stale + 25 sec heartbeat <= 50 sec maxStaleness.
+    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness.
     tags:
       data_center: nyc
   - &3
@@ -42,7 +42,7 @@ topology_description:
       data_center: tokyo  # No match.
 read_preference:
   mode: Secondary
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
   tag_sets:
   - data_center: nyc
 suitable_servers:

data/spec/support/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml

@@ -19,7 +19,7 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}  # Very stale.
 read_preference:
   mode: SecondaryPreferred
-  maxStalenessMS: 120000
+  maxStalenessSeconds: 120
 suitable_servers:
 - *1
 in_latency_window:

data/spec/support/max_staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml

@@ -10,7 +10,7 @@ topology_description:
     avg_rtt_ms: 5
     lastUpdateTime: 0
     maxWireVersion: 5
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     tags:
       data_center: tokyo  # No match, but its lastWriteDate is used in estimate.
   - &2
@@ -19,7 +19,7 @@ topology_description:
     avg_rtt_ms: 5
     lastUpdateTime: 0
     maxWireVersion: 5
-    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 25 sec stale + 25 sec heartbeat <= 50 sec maxStaleness.
+    lastWrite: {lastWriteDate: {$numberLong: "2"}}  # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness.
     tags:
       data_center: nyc
   - &3
@@ -42,7 +42,7 @@ topology_description:
       data_center: tokyo  # No match.
 read_preference:
   mode: SecondaryPreferred
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
   tag_sets:
   - data_center: nyc
 suitable_servers:

data/spec/support/max_staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml

@@ -0,0 +1,23 @@
+# maxStalenessSeconds=0 is prohibited.
+---
+topology_description:
+  type: ReplicaSetNoPrimary
+  servers:
+  - &1
+    address: a:27017
+    type: RSSecondary
+    avg_rtt_ms: 5
+    lastUpdateTime: 0
+    maxWireVersion: 5
+    lastWrite: {lastWriteDate: {$numberLong: "2"}}
+  - &2
+    address: b:27017
+    type: RSSecondary
+    avg_rtt_ms: 5
+    lastUpdateTime: 0
+    maxWireVersion: 4  # Incompatible.
+    lastWrite: {lastWriteDate: {$numberLong: "1"}}
+read_preference:
+  mode: Nearest
+  maxStalenessSeconds: 0
+error: true

data/spec/support/max_staleness/ReplicaSetWithPrimary/Incompatible.yml

@@ -1,6 +1,6 @@
-# During server selection,
-# clients (drivers or mongos) MUST raise an error if ``maxStalenessMS`` is not zero or null,
-# and any server's ``maxWireVersion`` is less than 5 (`SERVER-23893`_).
+# During server selection, clients (drivers or mongos) MUST raise an error if
+# maxStalenessSeconds is defined and not -1 and any server's ``maxWireVersion``
+# is less than 5 (`SERVER-23893`_).
 ---
 topology_description:
   type: ReplicaSetWithPrimary
@@ -21,5 +21,5 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 120000
+  maxStalenessSeconds: 120
 error: true

data/spec/support/max_staleness/ReplicaSetWithPrimary/LastUpdateTime.yml

@@ -13,21 +13,21 @@ topology_description:
     address: b:27017
     type: RSSecondary
     avg_rtt_ms: 5
-    lastUpdateTime: 25001
-    # Updated 25 sec after primary, so 25 sec stale.
-    # 25 sec stale + 25 sec heartbeat <= 50 sec maxStaleness.
+    lastUpdateTime: 125001
+    # Updated 125 sec after primary, so 125 sec stale.
+    # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness.
     lastWrite: {lastWriteDate: {$numberLong: "2"}}
     maxWireVersion: 5
   - &3
     address: c:27017
     type: RSSecondary
     avg_rtt_ms: 5
-    lastUpdateTime: 25001
+    lastUpdateTime: 125001
     lastWrite: {lastWriteDate: {$numberLong: "1"}}  # Too stale.
     maxWireVersion: 5
 read_preference:
   mode: Nearest
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
 suitable_servers:
 - *1
 - *2

data/spec/support/max_staleness/ReplicaSetWithPrimary/{ShortHeartbeartShortMaxStaleness2.yml → LongHeartbeat.yml}

@@ -1,7 +1,7 @@
-# Users can configure a shorter ``heartbeatFrequencyMS`` than the default to
-# allow a smaller ``maxStalenessMS`` with replica sets.
+# If users configure a longer ``heartbeatFrequencyMS`` than the default,
+# ``maxStalenessSeconds`` might have a larger minimum.
 ---
-heartbeatFrequencyMS: 1000  # 1 second.
+heartbeatFrequencyMS: 120000  # 120 seconds.
 topology_description:
   type: ReplicaSetWithPrimary
   servers:
@@ -21,7 +21,7 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 2000  # 2 seconds, permitted.
+  maxStalenessSeconds: 130  # OK, must be 120 + 10 = 130 seconds.
 suitable_servers:
 - *1
 - *2