mongo 2.11.1 → 2.11.6

data/spec/spec_tests/data/sdam_monitoring/{replica_set_other_seed.yml → replica_set_with_primary_change.yml}

@@ -1,24 +1,10 @@
-description: "Monitoring a topology that is a replica set with RSOther seed"
+description: "Monitoring a topology that is a replica set with primary address change"
 uri: "mongodb://a,b"
 phases: 
-  # phase 1
-  - 
-    responses: 
-      - 
-        - "a:27017"
-        - 
-          ok: 1
-          ismaster: true
-          setName: "rs"
-          setVersion: 1
-          primary: "c:27017"
-          hosts: 
-            - "c:27017"
-            - "d:27017"
-          minWireVersion: 0
-          maxWireVersion: 4
-    outcome: 
-      events: 
+  -
+    responses: []
+    outcome:
+      events:
         - 
           topology_opening_event: 
             topologyId: "42"
@@ -28,7 +14,7 @@ phases:
             previousDescription: 
               topologyType: "Unknown"
               servers: []
-            newDescription: 
+            newDescription:
               topologyType: "Unknown"
               servers: 
                 - 
@@ -51,6 +37,23 @@ phases:
           server_opening_event: 
             topologyId: "42"
             address: "b:27017"
+  # phase 1 - discover topology
+  - 
+    responses: 
+      - 
+        - "a:27017"
+        - 
+          ok: 1
+          ismaster: true
+          setName: "rs"
+          setVersion: 1
+          primary: "a:27017"
+          hosts: 
+            - "a:27017"
+          minWireVersion: 0
+          maxWireVersion: 4
+    outcome: 
+      events: 
         - 
           server_description_changed_event: 
             topologyId: "42"
@@ -65,12 +68,15 @@ phases:
               address: "a:27017"
               arbiters: []
               hosts: 
-                - "c:27017"
-                - "d:27017"
+                - "a:27017"
               passives: []
-              primary: "c:27017"
+              primary: "a:27017"
               setName: "rs"
-              type: "RSOther"
+              type: "RSPrimary"
+        - 
+          server_closed_event: 
+            topologyId: "42"
+            address: "b:27017"
         - 
           topology_description_changed_event: 
             topologyId: "42"
@@ -90,60 +96,88 @@ phases:
                   passives: []
                   type: "Unknown"
             newDescription: 
-              topologyType: "ReplicaSetNoPrimary"
-              setName: rs
+              topologyType: "ReplicaSetWithPrimary"
+              setName: "rs"
               servers: 
                 - 
                   address: "a:27017"
                   arbiters: []
                   hosts: 
-                    - "c:27017"
-                    - "d:27017"
+                    - "a:27017"
                   passives: []
-                  primary: "c:27017"
+                  primary: "a:27017"
                   setName: "rs"
-                  type: "RSOther"
-                - 
-                  address: "b:27017"
-                  arbiters: []
-                  hosts: []
-                  passives: []
-                  type: "Unknown"
+                  type: "RSPrimary"
+
+
+  # phase 2 - primary changes ip address
+  - 
+    responses: 
+      - 
+        - "a:27017"
+        - 
+          ok: 1
+          ismaster: true
+          setName: "rs"
+          setVersion: 1
+          primary: "aa:27017"
+          me: "aa:27017"
+          hosts: 
+            - "aa:27017"
+          minWireVersion: 0
+          maxWireVersion: 4
+    outcome: 
+      events: 
+        # TODO see about having the opening event precede the closing event.
+        - 
+          server_closed_event: 
+            topologyId: "42"
+            address: "a:27017"
+        - 
+          server_opening_event: 
+            topologyId: "42"
+            address: "aa:27017"
+        - 
+          topology_description_changed_event: 
+            topologyId: "42"
+            previousDescription: 
+              topologyType: "ReplicaSetWithPrimary"
+              setName: "rs"
+              servers: 
                 - 
-                  address: "c:27017"
+                  address: "a:27017"
                   arbiters: []
-                  hosts: []
+                  hosts: 
+                    - "a:27017"
                   passives: []
-                  type: "Unknown"
+                  primary: "a:27017"
+                  setName: "rs"
+                  type: "RSPrimary"
+            newDescription:
+              topologyType: "ReplicaSetNoPrimary"
+              setName: rs
+              servers: 
                 - 
-                  address: "d:27017"
+                  address: "aa:27017"
                   arbiters: []
                   hosts: []
                   passives: []
                   type: "Unknown"
-        - 
-          server_opening_event: 
-            topologyId: "42"
-            address: "c:27017"
-        - 
-          server_opening_event: 
-            topologyId: "42"
-            address: "d:27017"
 
-  # phase 2
+  # phaes 3 - response from new primary from new address
   - 
     responses: 
       - 
-        - "c:27017"
+        - "aa:27017"
         - 
           ok: 1
           ismaster: true
           setName: "rs"
           setVersion: 1
-          primary: "c:27017"
+          primary: "aa:27017"
+          me: "aa:27017"
           hosts: 
-            - "c:27017"
-            - "d:27017"
+            - "aa:27017"
           minWireVersion: 0
           maxWireVersion: 4
     outcome: 
@@ -151,31 +185,22 @@ phases:
         - 
           server_description_changed_event: 
             topologyId: "42"
-            address: "c:27017"
+            address: "aa:27017"
             previousDescription: 
-              address: "c:27017"
+              address: "aa:27017"
               arbiters: []
               hosts: []
               passives: []
               type: "Unknown"
             newDescription: 
-              address: "c:27017"
+              address: "aa:27017"
               arbiters: []
               hosts: 
-                - "c:27017"
-                - "d:27017"
+                - "aa:27017"
               passives: []
-              primary: "c:27017"
+              primary: "aa:27017"
               setName: "rs"
               type: "RSPrimary"
-        - 
-          server_closed_event: 
-            topologyId: "42"
-            address: "a:27017"
-        - 
-          server_closed_event: 
-            topologyId: "42"
-            address: "b:27017"
         - 
           topology_description_changed_event: 
             topologyId: "42"
@@ -184,50 +209,21 @@ phases:
               setName: rs
               servers: 
                 - 
-                  address: "a:27017"
-                  arbiters: []
-                  hosts: 
-                    - "c:27017"
-                    - "d:27017"
-                  passives: []
-                  primary: "c:27017"
-                  setName: "rs"
-                  type: "RSOther"
-                - 
-                  address: "b:27017"
-                  arbiters: []
-                  hosts: []
-                  passives: []
-                  type: "Unknown"
-                - 
-                  address: "c:27017"
+                  address: "aa:27017"
                   arbiters: []
                   hosts: []
                   passives: []
                   type: "Unknown"
-                - 
-                  address: "d:27017"
-                  arbiters: []
-                  hosts: []
-                  passives: []
-                  type: "Unknown"
-            newDescription: 
+            newDescription:
               topologyType: "ReplicaSetWithPrimary"
               setName: "rs"
               servers: 
                 - 
-                  address: "c:27017"
+                  address: "aa:27017"
                   arbiters: []
                   hosts: 
-                    - "c:27017"
-                    - "d:27017"
+                    - "aa:27017"
                   passives: []
-                  primary: "c:27017"
+                  primary: "aa:27017"
                   setName: "rs"
                   type: "RSPrimary"
-                - 
-                  address: "d:27017"
-                  arbiters: []
-                  hosts: []
-                  passives: []
-                  type: "Unknown"

data/spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_removal.yml

@@ -1,23 +1,10 @@
 description: "Monitoring a topology that is a replica set with primary removal"
 uri: "mongodb://a,b"
 phases: 
-  # phase 1 - discover topology
-  - 
-    responses: 
-      - 
-        - "a:27017"
-        - 
-          ok: 1
-          ismaster: true
-          setName: "rs"
-          setVersion: 1
-          primary: "a:27017"
-          hosts: 
-            - "a:27017"
-          minWireVersion: 0
-          maxWireVersion: 4
-    outcome: 
-      events: 
+  -
+    responses: []
+    outcome:
+      events:
         - 
           topology_opening_event: 
             topologyId: "42"
@@ -50,6 +37,23 @@ phases:
           server_opening_event: 
             topologyId: "42"
             address: "b:27017"
+  # phase 1 - discover topology
+  - 
+    responses: 
+      - 
+        - "a:27017"
+        - 
+          ok: 1
+          ismaster: true
+          setName: "rs"
+          setVersion: 1
+          primary: "a:27017"
+          hosts: 
+            - "a:27017"
+          minWireVersion: 0
+          maxWireVersion: 4
+    outcome: 
+      events: 
         - 
           server_description_changed_event: 
             topologyId: "42"
@@ -144,7 +148,7 @@ phases:
               passives: []
               primary: "c:27017"
               setName: "wrong"
-              type: "RSOther"
+              type: "RSPrimary"
         - 
           server_closed_event: 
             topologyId: "42"

data/spec/spec_tests/data/sdam_monitoring/standalone_to_rs_with_me_mismatch.yml

@@ -0,0 +1,90 @@
+description: "Standalone connection to a replica set node with a me mismatch"
+uri: "mongodb://a/?connect=direct"
+phases: 
+  -
+    responses: []
+    outcome:
+      events:
+        - 
+          topology_opening_event: 
+            topologyId: "42"
+        - 
+          topology_description_changed_event: 
+            topologyId: "42"
+            previousDescription: 
+              topologyType: "Unknown"
+              servers: []
+            newDescription:
+              topologyType: "Single"
+              servers: 
+                - 
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                  type: "Unknown"
+        - 
+          server_opening_event: 
+            topologyId: "42"
+            address: "a:27017"
+  # phase 1 - server is a primary with mismatched me
+  - 
+    responses: 
+      - 
+        - "a:27017"
+        - 
+          ok: 1
+          ismaster: true
+          setName: "rs"
+          setVersion: 1
+          primary: "aa:27017"
+          me: "aa:27017"
+          hosts: 
+            - "aa:27017"
+          minWireVersion: 0
+          maxWireVersion: 4
+    outcome: 
+      events: 
+        - 
+          server_description_changed_event: 
+            topologyId: "42"
+            address: "a:27017"
+            previousDescription: 
+              address: "a:27017"
+              arbiters: []
+              hosts: []
+              passives: []
+              type: "Unknown"
+            newDescription: 
+              address: "a:27017"
+              arbiters: []
+              hosts: 
+                - "aa:27017"
+              passives: []
+              primary: "aa:27017"
+              setName: "rs"
+              type: "RSPrimary"
+        - 
+          topology_description_changed_event: 
+            topologyId: "42"
+            previousDescription: 
+              topologyType: "Single"
+              servers: 
+                - 
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                  type: "Unknown"
+            newDescription: 
+              topologyType: "Single"
+              servers: 
+                - 
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: 
+                    - "aa:27017"
+                  passives: []
+                  primary: "aa:27017"
+                  setName: "rs"
+                  type: "RSPrimary"

data/spec/support/cluster_config.rb

@@ -2,6 +2,7 @@ require 'singleton'
 
 class ClusterConfig
   include Singleton
+  include RSpec::Core::Pending
 
   def single_server?
     determine_cluster_config
@@ -114,6 +115,41 @@ class ClusterConfig
     end
   end
 
+  # This method returns an alternate address for connecting to the configured
+  # deployment. For example, if the replica set is configured with nodes at
+  # of localhost:27017 and so on, this method will return 127.0.0.:27017.
+  #
+  # Note that the "alternate" refers to replica set configuration, not the
+  # addresses specified in test suite configuration. If the deployment topology
+  # is not a replica set, "alternate" refers to test suite configuration as
+  # this is the only configuration available.
+  def alternate_address
+    @alternate_address ||= begin
+      address = primary_address_host
+      str = case address
+      when '127.0.0.1'
+        'localhost'
+      when /^(\d+\.){3}\d+$/
+        skip 'This test requires a hostname or 127.0.0.1 as address'
+      else
+        # We don't know if mongod is listening on ipv4 or ipv6, in principle.
+        # Our tests use ipv4, so hardcode that for now.
+        # To support both we need to try both addresses which will make this
+        # test more complicated.
+        #
+        # JRuby chokes on primary_address_port as the port (e.g. 27017).
+        # Since the port does not actually matter, use a common port like 80.
+        resolved_address = Addrinfo.getaddrinfo(address, 80, Socket::PF_INET).first.ip_address
+        if resolved_address.include?(':')
+          "[#{resolved_address}]"
+        else
+          resolved_address
+        end
+      end + ":#{primary_address_port}"
+      Mongo::Address.new(str)
+    end
+  end
+
   private
 
   def determine_cluster_config