mongo 2.11.1 → 2.11.6

data/spec/mongo/socket/tcp_spec.rb

@@ -1,16 +1,8 @@
 require 'spec_helper'
 
 describe Mongo::Socket::TCP do
-  require_no_tls
-
-  let(:address) { default_address }
-
-  let!(:resolver) do
-    address.send(:create_resolver, {})
-  end
-
   let(:socket) do
-    resolver.socket(5, {})
+    described_class.new('127.0.0.1', SpecConfig.instance.any_port, 5, Socket::AF_INET)
   end
 
   describe '#address' do

data/spec/mongo/uri_spec.rb

@@ -352,7 +352,7 @@ describe Mongo::URI do
       let(:servers) { '%2Ftmp%2Fmongodb-27017.sock' }
 
       it 'returns an array with the parsed server' do
-        expect(uri.servers).to eq([URI.unescape(servers)])
+        expect(uri.servers).to eq([URI::DEFAULT_PARSER.unescape(servers)])
       end
     end
 

data/spec/runners/sdam/verifier.rb

@@ -37,10 +37,13 @@ module Sdam
         verify_description_matches(server, desc)
       end
 
+      # Verify actual topology has no servers not also present in the
+      # expected topology description.
+      expected_addresses = expected['servers'].map do |server|
+        server['address']
+      end
       actual.server_descriptions.keys.each do |address_str|
-        expect(
-          expected['servers'].any? { |server| server['address'] == address_str }
-        ).to be true
+        expect(expected_addresses).to include(address_str)
       end
     end
 

data/spec/spec_tests/data/sdam/rs/primary_address_change.yml

@@ -0,0 +1,29 @@
+description: Primary whose address differs from client address but no me mismatch
+uri: mongodb://localhost:27017/?replicaSet=rs
+phases:
+-
+  responses:
+  -
+    - localhost:27017
+    - hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Both of the hosts in the primary description are added to the topology.
+    # Existing server (localhost:27017) is removed from topology because
+    # its address is not in the list of hosts returned by the primary.
+    servers:
+      a:27017:
+        setName: 
+        type: Unknown
+      b:27017:
+        setName: 
+        type: Unknown
+    setName: rs
+    topologyType: ReplicaSetNoPrimary
+    logicalSessionTimeoutMinutes: 

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

@@ -1,26 +1,30 @@
 description: Primary mismatched me
+uri: mongodb://localhost:27017/?replicaSet=rs
 phases:
-  - outcome:
-      servers:
-        'a:27017':
-          setName: null
-          type: Unknown
-        'b:27017':
-          setName: null
-          type: Unknown
+-
+  responses:
+  -
+    - localhost:27017
+    - me: a:27017
+      hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
       setName: rs
-      topologyType: ReplicaSetNoPrimary
-      logicalSessionTimeoutMinutes: null
-    responses:
-      - - 'localhost:27017'
-        - me: 'a:27017'
-          hosts:
-            - 'a:27017'
-            - 'b:27017'
-          ismaster: true
-          ok: 1
-          setName: rs
-          minWireVersion: 0
-          maxWireVersion: 6
-uri: 'mongodb://localhost:27017/?replicaSet=rs'
-
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Both of the hosts in the primary description are added to the topology.
+    # Existing server (localhost:27017) is removed from topology because
+    # its address is not in the list of hosts returned by the primary.
+    servers:
+      a:27017:
+        setName: 
+        type: Unknown
+      b:27017:
+        setName: 
+        type: Unknown
+    setName: rs
+    topologyType: ReplicaSetNoPrimary
+    logicalSessionTimeoutMinutes: 

data/spec/spec_tests/data/sdam/rs/primary_to_no_primary_mismatched_me.yml

@@ -1,79 +1,56 @@
-description: "Primary to no primary with mismatched me"
-
-uri: "mongodb://a/?replicaSet=rs"
-
-phases: [
-
-    {
-        responses: [
-
-                ["a:27017", {
-
-                    ok: 1,
-                    ismaster: true,
-                    hosts: ["a:27017", "b:27017"],
-                    me: "a:27017",
-                    setName: "rs",
-                    minWireVersion: 0,
-                    maxWireVersion: 6
-                }]
-        ],
-
-        outcome: {
-
-            servers: {
-
-                "a:27017": {
-
-                    type: "RSPrimary",
-                    setName: "rs"
-                },
-
-                "b:27017": {
-
-                    type: "Unknown",
-                    setName:
-                }
-            },
-            topologyType: "ReplicaSetWithPrimary",
-            logicalSessionTimeoutMinutes: null,
-            setName: "rs"
-        }
-    },
-    {
-        responses: [
-
-                ["a:27017", {
-
-                    ok: 1,
-                    ismaster: true,
-                    hosts: ["c:27017", "d:27017"],
-                    me : "c:27017",
-                    setName: "rs",
-                    minWireVersion: 0,
-                    maxWireVersion: 6
-                }]
-        ],
-
-        outcome: {
-
-            servers: {
-
-                "c:27017": {
-
-                    type: "Unknown",
-                    setName:
-                },
-
-                "d:27017": {
-
-                    type: "Unknown",
-                    setName:
-                }
-            },
-            topologyType: "ReplicaSetNoPrimary",
-            logicalSessionTimeoutMinutes: null,
-            setName: "rs"
-        }
-    }
-]
+description: Primary to no primary with mismatched me
+uri: mongodb://a/?replicaSet=rs
+
+phases:
+-
+  responses:
+  -
+    - a:27017
+    - ok: 1
+      ismaster: true
+      hosts:
+      - a:27017
+      - b:27017
+      me: a:27017
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    servers:
+      a:27017:
+        type: RSPrimary
+        setName: rs
+      b:27017:
+        type: Unknown
+        setName: 
+    topologyType: ReplicaSetWithPrimary
+    logicalSessionTimeoutMinutes: 
+    setName: rs
+
+-
+  responses:
+  -
+    - a:27017
+    - ok: 1
+      ismaster: true
+      hosts:
+      - c:27017
+      - d:27017
+      me: c:27017
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Hosts from primary description (c:27017 and d:27017) added to the topoolgy.
+    # Hosts not in primary description (a:27017 and b:27017) are removed from
+    # the topology.
+    servers:
+      c:27017:
+        type: Unknown
+        setName: 
+      d:27017:
+        type: Unknown
+        setName: 
+    topologyType: ReplicaSetNoPrimary
+    logicalSessionTimeoutMinutes: 
+    setName: rs

data/spec/spec_tests/data/sdam/sharded/primary_address_change.yml

@@ -0,0 +1,21 @@
+description: RS Primary whose address differs from client address but no me mismatch
+uri: mongodb://localhost:27017/?connect=sharded
+phases:
+-
+  responses:
+  -
+    - localhost:27017
+    - hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Since the server is of the wrong type, it is removed from the topology.
+    servers:
+      {}
+    topologyType: Sharded
+    logicalSessionTimeoutMinutes: 

data/spec/spec_tests/data/sdam/sharded/primary_mismatched_me.yml

@@ -0,0 +1,22 @@
+description: RS Primary w/mismatched me
+uri: mongodb://localhost:27017/?connect=sharded
+phases:
+-
+  responses:
+  -
+    - localhost:27017
+    - me: a:27017
+      hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # Since the server is of the wrong type, it is removed from the topology.
+    servers:
+      {}
+    topologyType: Sharded
+    logicalSessionTimeoutMinutes: 

data/spec/spec_tests/data/sdam/single/primary_address_change.yml

@@ -0,0 +1,24 @@
+description: RS Primary whose address differs from client address but no me mismatch
+uri: mongodb://localhost:27017/?connect=direct
+phases:
+-
+  responses:
+  -
+    - localhost:27017
+    - hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # In Single topology the server type is preserved. In this case the
+    # connection is to a RS primary.
+    servers:
+      localhost:27017:
+        type: RSPrimary
+        setName: rs
+    topologyType: Single
+    logicalSessionTimeoutMinutes: 

data/spec/spec_tests/data/sdam/single/primary_mismatched_me.yml

@@ -0,0 +1,25 @@
+description: RS Primary w/mismatched me
+uri: mongodb://localhost:27017/?connect=direct
+phases:
+-
+  responses:
+  -
+    - localhost:27017
+    - me: a:27017
+      hosts:
+      - a:27017
+      - b:27017
+      ismaster: true
+      ok: 1
+      setName: rs
+      minWireVersion: 0
+      maxWireVersion: 6
+  outcome:
+    # In Single topology the server type is preserved. In this case the
+    # connection is to a RS primary.
+    servers:
+      localhost:27017:
+        type: RSPrimary
+        setName: rs
+    topologyType: Single
+    logicalSessionTimeoutMinutes: 

data/spec/spec_tests/data/sdam_monitoring/replica_set_with_me_mismatch.yml

@@ -0,0 +1,159 @@
+description: "Monitoring a topology that is a replica set with a me mismatch in first response"
+uri: "mongodb://a,b/"
+phases: 
+  -
+    responses: []
+    outcome:
+      events:
+        - 
+          topology_opening_event: 
+            topologyId: "42"
+        - 
+          topology_description_changed_event: 
+            topologyId: "42"
+            previousDescription: 
+              topologyType: "Unknown"
+              servers: []
+            newDescription:
+              topologyType: "Unknown"
+              servers: 
+                - 
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                  type: "Unknown"
+                - 
+                  address: "b:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                  type: "Unknown"
+        - 
+          server_opening_event: 
+            topologyId: "42"
+            address: "a:27017"
+        - 
+          server_opening_event: 
+            topologyId: "42"
+            address: "b:27017"
+  # phase 1 - server is a primary with mismatched me
+  - 
+    responses: 
+      - 
+        - "a:27017"
+        - 
+          ok: 1
+          ismaster: true
+          setName: "rs"
+          setVersion: 1
+          me: "aa:27017"
+          primary: "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_closed_event: 
+            topologyId: "42"
+            address: "b:27017"
+        - 
+          server_opening_event: 
+            topologyId: "42"
+            address: "aa:27017"
+        - 
+          topology_description_changed_event: 
+            topologyId: "42"
+            previousDescription: 
+              topologyType: "Unknown"
+              servers: 
+                - 
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                - 
+                  address: "b:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+            newDescription:
+              topologyType: "ReplicaSetNoPrimary"
+              setName: rs
+              servers: 
+                - 
+                  address: "aa:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+
+  # phaes 2 - response from new primary from new address
+  - 
+    responses: 
+      - 
+        - "aa: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: "aa:27017"
+            previousDescription: 
+              address: "aa:27017"
+              arbiters: []
+              hosts: []
+              passives: []
+              type: "Unknown"
+            newDescription: 
+              address: "aa:27017"
+              arbiters: []
+              hosts: 
+                - "aa:27017"
+              passives: []
+              primary: "aa:27017"
+              setName: "rs"
+              type: "RSPrimary"
+        - 
+          topology_description_changed_event: 
+            topologyId: "42"
+            previousDescription: 
+              topologyType: "ReplicaSetNoPrimary"
+              setName: rs
+              servers: 
+                - 
+                  address: "aa:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                  type: "Unknown"
+            newDescription:
+              topologyType: "ReplicaSetWithPrimary"
+              setName: "rs"
+              servers: 
+                - 
+                  address: "aa:27017"
+                  arbiters: []
+                  hosts: 
+                    - "aa:27017"
+                  passives: []
+                  primary: "aa:27017"
+                  setName: "rs"
+                  type: "RSPrimary"