mongo 2.4.0.rc1 → 2.4.0

data/spec/support/max_staleness/ReplicaSetWithPrimary/{ShortHeartbeartShortMaxStaleness.yml → LongHeartbeat2.yml}

@@ -1,14 +1,14 @@
-# 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:
   - &1
     address: a:27017
     type: RSPrimary
-    avg_rtt_ms: 50  # Too far.
+    avg_rtt_ms: 5
     lastUpdateTime: 0
     maxWireVersion: 5
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
@@ -21,9 +21,5 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 2000  # 2 seconds, permitted.
-suitable_servers:
-- *1
-- *2
-in_latency_window:
-- *2
+  maxStalenessSeconds: 129  # Too small, must be 120 + 10 = 130 seconds.
+error: true

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

@@ -1,7 +1,8 @@
 # A driver MUST raise an error
 # if the TopologyType is ReplicaSetWithPrimary or ReplicaSetNoPrimary
-# and ``maxStalenessMS`` is less than twice the client's `heartbeatFrequencyMS`.
+# and ``maxStalenessSeconds`` is less than 90.
 ---
+heartbeatFrequencyMS: 500
 topology_description:
   type: ReplicaSetWithPrimary
   servers:
@@ -21,5 +22,5 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 1  # Too small.
+  maxStalenessSeconds: 89  # Too small.
 error: true

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

@@ -1,4 +1,4 @@
-# Drivers MUST raise an error if ``maxStalenessMS`` is not zero or null
+# Drivers MUST raise an error if maxStalenessSeconds is defined and not -1
 # and the ``mode`` field is 'primary'.
 ---
 topology_description:
@@ -19,5 +19,5 @@ topology_description:
     maxWireVersion: 5
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
-  maxStalenessMS: 120000
+  maxStalenessSeconds: 120
 error: true

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

@@ -7,14 +7,14 @@ topology_description:
     type: RSPrimary
     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/ReplicaSetWithPrimary/Nearest2.yml

@@ -7,14 +7,14 @@ topology_description:
     type: RSPrimary
     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/ReplicaSetWithPrimary/Nearest_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: RSPrimary
     avg_rtt_ms: 5
     lastUpdateTime: 0
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     maxWireVersion: 5
     tags:
       data_center: tokyo
@@ -26,7 +26,7 @@ topology_description:
       data_center: nyc
 read_preference:
   mode: Nearest
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
   tag_sets:
   - data_center: nyc
   - data_center: tokyo

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

@@ -1,4 +1,4 @@
-# Ignore maxStalenessMS is primary is available.
+# Ignore maxStalenessSeconds if primary is available.
 ---
 heartbeatFrequencyMS: 25000  # 25 seconds.
 topology_description:
@@ -20,7 +20,7 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: PrimaryPreferred
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
 suitable_servers:
 - *1
 in_latency_window:

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

@@ -1,6 +1,6 @@
 # Primary has wire version 5, secondary has 4, read preference primaryPreferred
-# with maxStalenessMS. The client must error, even though it uses primary and
-# never applies maxStalenessMS. Proves that the compatibility check precedes
+# with maxStalenessSeconds. The client must error, even though it uses primary and
+# never applies maxStalenessSeconds. Proves that the compatibility check precedes
 # filtration.
 ---
 topology_description:
@@ -22,6 +22,6 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: PrimaryPreferred
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
 error: true
 

data/spec/support/max_staleness/ReplicaSetWithPrimary/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/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml

@@ -10,14 +10,14 @@ topology_description:
     avg_rtt_ms: 5
     lastUpdateTime: 0
     maxWireVersion: 5
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
   - &2
     address: b:27017
     type: RSSecondary
     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
@@ -49,7 +49,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/ReplicaSetWithPrimary/SecondaryPreferred_tags2.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 secondary in NYC is
 # stale then use Tokyo.
 ---
@@ -11,7 +11,7 @@ topology_description:
     type: RSPrimary
     avg_rtt_ms: 5
     lastUpdateTime: 0
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     maxWireVersion: 5
   - &2
     address: b:27017
@@ -33,7 +33,7 @@ topology_description:
       data_center: nyc
 read_preference:
   mode: SecondaryPreferred
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
   tag_sets:
   - data_center: nyc
   - data_center: tokyo

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

@@ -10,14 +10,14 @@ topology_description:
     avg_rtt_ms: 5
     lastUpdateTime: 0
     maxWireVersion: 5
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
   - &2
     address: b:27017
     type: RSSecondary
     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
@@ -49,7 +49,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/ReplicaSetWithPrimary/Secondary_tags2.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 secondary in NYC is
 # stale then use Tokyo.
 ---
@@ -11,7 +11,7 @@ topology_description:
     type: RSPrimary
     avg_rtt_ms: 5
     lastUpdateTime: 0
-    lastWrite: {lastWriteDate: {$numberLong: "25002"}}
+    lastWrite: {lastWriteDate: {$numberLong: "125002"}}
     maxWireVersion: 5
   - &2
     address: b:27017
@@ -33,7 +33,7 @@ topology_description:
       data_center: nyc
 read_preference:
   mode: Secondary
-  maxStalenessMS: 50000
+  maxStalenessSeconds: 150
   tag_sets:
   - data_center: nyc
   - data_center: tokyo

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

@@ -1,4 +1,4 @@
-# A ``maxStalenessMS`` of zero or null MUST mean "no maximum".
+# maxStalenessSeconds=0 is prohibited.
 ---
 topology_description:
   type: ReplicaSetWithPrimary
@@ -6,22 +6,18 @@ topology_description:
   - &1
     address: a:27017
     type: RSPrimary
-    avg_rtt_ms: 50  # Too far.
+    avg_rtt_ms: 5
     lastUpdateTime: 0
     maxWireVersion: 5
-    lastWrite: {lastWriteDate: {$numberLong: "1000001"}}
+    lastWrite: {lastWriteDate: {$numberLong: "2"}}
   - &2
     address: b:27017
     type: RSSecondary
     avg_rtt_ms: 5
     lastUpdateTime: 0
-    maxWireVersion: 5
-    lastWrite: {lastWriteDate: {$numberLong: "1"}}  # Very stale.
+    maxWireVersion: 4  # Incompatible.
+    lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 0  # Means "no max staleness".
-suitable_servers:  # Very stale server is fine.
-- *1
-- *2
-in_latency_window:
-- *2
+  maxStalenessSeconds: 0
+error: true

data/spec/support/max_staleness/Sharded/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: Sharded
@@ -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/Sharded/SmallMaxStaleness.yml

@@ -1,4 +1,4 @@
-# Driver doesn't validate maxStalenessMS for mongos
+# Driver doesn't validate maxStalenessSeconds for mongos
 ---
 heartbeatFrequencyMS: 10000
 topology_description:
@@ -11,10 +11,18 @@ topology_description:
     lastUpdateTime: 0
     maxWireVersion: 5
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
+  - &2
+    address: b:27017
+    type: Mongos
+    avg_rtt_ms: 50  # Too far.
+    lastUpdateTime: 0
+    maxWireVersion: 5
+    lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 1  # OK for sharding.
+  maxStalenessSeconds: 1  # OK for sharding.
 suitable_servers:
 - *1
+- *2
 in_latency_window:
 - *1

data/spec/support/max_staleness/Single/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: Single
@@ -14,5 +14,5 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 120000
+  maxStalenessSeconds: 120
 error: true

data/spec/support/max_staleness/Single/SmallMaxStaleness.yml

@@ -1,4 +1,4 @@
-# Driver doesn't validate maxStalenessMS for direct connection.
+# Driver doesn't validate maxStalenessSeconds for direct connection.
 ---
 heartbeatFrequencyMS: 10000
 topology_description:
@@ -13,7 +13,7 @@ topology_description:
     lastWrite: {lastWriteDate: {$numberLong: "1"}}
 read_preference:
   mode: Nearest
-  maxStalenessMS: 1
+  maxStalenessSeconds: 1
 suitable_servers:
 - *1
 in_latency_window:

data/spec/support/max_staleness/Unknown/SmallMaxStaleness.yml

@@ -0,0 +1,14 @@
+# Driver doesn't validate maxStalenessSeconds while TopologyType is Unknown.
+---
+heartbeatFrequencyMS: 10000
+topology_description:
+  type: Unknown
+  servers:
+  - &1
+    address: a:27017
+    type: Unknown
+read_preference:
+  mode: Nearest
+  maxStalenessSeconds: 1
+suitable_servers: []
+in_latency_window: []

data/spec/support/sdam/rs/primary_mismatched_me.yml

@@ -18,7 +18,7 @@
             },
             "responses": [
                 [
-                    "localhost:27017",
+                    "lhost:27017",
                      {
                          "me": "a:27017",
                          "hosts": [
@@ -33,5 +33,5 @@
             ]
         }
     ],
-    "uri": "mongodb://localhost:27017/?replicaSet=rs"
+    "uri": "mongodb://lhost:27017/?replicaSet=rs"
 }

data/spec/support/sdam/rs/secondary_mismatched_me.yml

@@ -18,7 +18,7 @@
             },
             "responses": [
                 [
-                    "localhost:27017",
+                    "lhost:27017",
                      {
                          "me": "a:27017",
                          "hosts": [
@@ -33,5 +33,5 @@
             ]
         }
     ],
-    "uri": "mongodb://localhost:27017/?replicaSet=rs"
+    "uri": "mongodb://lhost:27017/?replicaSet=rs"
 }

data/spec/support/sdam_monitoring.rb

@@ -0,0 +1,144 @@
+# Copyright (C) 2014-2015 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.
+#
+
+RSpec::Matchers.define :match_topology_opening_event do |expectation|
+
+  match do |event|
+    event.topology != nil
+  end
+end
+
+RSpec::Matchers.define :match_topology_description_changed_event do |expectation|
+  include Mongo::SDAMMonitoring::Matchable
+
+  match do |event|
+    topologies_match?(event, expectation)
+  end
+end
+
+RSpec::Matchers.define :match_server_opening_event do |expectation|
+
+  match do |event|
+    true
+  end
+end
+
+RSpec::Matchers.define :match_server_description_changed_event do |expectation|
+  include Mongo::SDAMMonitoring::Matchable
+
+  match do |event|
+    descriptions_match?(event, expectation)
+  end
+end
+
+RSpec::Matchers.define :match_server_closed_event do |expectation|
+
+  match do |event|
+    event.address.to_s == expectation.data['address']
+  end
+end
+
+RSpec::Matchers.define :match_sdam_monitoring_event do |expectation|
+
+  match do |event|
+    expect(event).to send("match_#{expectation.name}", expectation)
+  end
+end
+
+module Mongo
+  module SDAMMonitoring
+    module Matchable
+
+      def descriptions_match?(event, expectation)
+        description_matches?(event.previous_description, expectation.data['previousDescription']) &&
+          description_matches?(event.new_description, expectation.data['newDescription'])
+      end
+
+      def topologies_match?(event, expectation)
+        topology_matches?(event.previous_topology, expectation.data['previousDescription']) &&
+          topology_matches?(event.new_topology, expectation.data['newDescription'])
+      end
+
+      def description_matches?(actual, expected)
+        case expected['type']
+          when 'Standalone' then actual.standalone?
+          when 'RSPrimary' then actual.primary?
+          when 'RSSecondary' then actual.secondary?
+          when 'RSArbiter' then actual.arbiter?
+          when 'Mongos' then actual.mongos?
+          when 'Unknown' then actual.unknown?
+          when 'PossiblePrimary' then actual.unknown?
+          when 'RSGhost' then actual.ghost?
+          when 'RSOther' then actual.other?
+        end
+      end
+
+      def topology_matches?(actual, expected)
+        case expected['topologyType']
+          when 'ReplicaSetWithPrimary' then actual.replica_set?
+          when 'ReplicaSetNoPrimary' then (actual.replica_set? || actual.unknown?)
+          when 'Sharded' then actual.sharded?
+          when 'Single' then actual.single?
+          when 'Unknown' then actual.unknown?
+        end
+      end
+    end
+
+    # Test subscriber for SDAM monitoring.
+    #
+    # @since 2.4.0
+    class TestSubscriber
+
+      # The mappings of event names to types.
+      #
+      # @since 2.4.0
+      MAPPINGS = {
+        'topology_opening_event' => Mongo::Monitoring::Event::TopologyOpening,
+        'topology_description_changed_event' => Mongo::Monitoring::Event::TopologyChanged,
+        'server_opening_event' => Mongo::Monitoring::Event::ServerOpening,
+        'server_description_changed_event' => Mongo::Monitoring::Event::ServerDescriptionChanged,
+        'server_closed_event' => Mongo::Monitoring::Event::ServerClosed
+      }.freeze
+
+      # Implement the succeeded event.
+      #
+      # @param [ Event ] event The event.
+      #
+      # @since 2.4.0
+      def succeeded(event)
+        events.push(event)
+      end
+
+      # Get the first event fired for the name, and then delete it.
+      #
+      # @param [ String ] name The event name.
+      #
+      # @return [ Event ] The matching event.
+      def first_event(name)
+        matching = events.find do |event|
+          event.class == MAPPINGS[name]
+        end
+        events.delete(matching)
+        matching
+      end
+
+      private
+
+      def events
+        @events ||= []
+      end
+    end
+  end
+end