RubyGems - mongo - Versions diffs - 2.11.0 → 2.11.5 - Mend

mongo 2.11.0 → 2.11.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (95) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +0 -0
data.tar.gz.sig +0 -0
data/Rakefile +24 -0
data/lib/mongo/address.rb +53 -37
data/lib/mongo/auth.rb +30 -10
data/lib/mongo/auth/cr.rb +1 -0
data/lib/mongo/auth/cr/conversation.rb +13 -13
data/lib/mongo/auth/ldap.rb +2 -1
data/lib/mongo/auth/ldap/conversation.rb +9 -12
data/lib/mongo/auth/scram.rb +1 -0
data/lib/mongo/auth/scram/conversation.rb +36 -27
data/lib/mongo/auth/user.rb +7 -1
data/lib/mongo/auth/x509.rb +2 -1
data/lib/mongo/auth/x509/conversation.rb +9 -9
data/lib/mongo/bulk_write/transformable.rb +3 -3
data/lib/mongo/client.rb +17 -6
data/lib/mongo/cluster.rb +67 -49
data/lib/mongo/cluster/sdam_flow.rb +87 -3
data/lib/mongo/collection/view/readable.rb +3 -1
data/lib/mongo/collection/view/writable.rb +3 -3
data/lib/mongo/cursor/builder/kill_cursors_command.rb +8 -1
data/lib/mongo/cursor/builder/op_kill_cursors.rb +8 -1
data/lib/mongo/database.rb +1 -1
data/lib/mongo/grid/file.rb +5 -0
data/lib/mongo/grid/file/chunk.rb +2 -0
data/lib/mongo/grid/fs_bucket.rb +15 -13
data/lib/mongo/grid/stream/write.rb +9 -3
data/lib/mongo/protocol/serializers.rb +12 -2
data/lib/mongo/retryable.rb +33 -8
data/lib/mongo/server.rb +13 -6
data/lib/mongo/server/connection.rb +15 -8
data/lib/mongo/server/connection_base.rb +7 -4
data/lib/mongo/server/description.rb +34 -21
data/lib/mongo/server/monitor.rb +1 -1
data/lib/mongo/server/monitor/connection.rb +2 -3
data/lib/mongo/session.rb +10 -10
data/lib/mongo/socket.rb +10 -1
data/lib/mongo/uri.rb +1 -1
data/lib/mongo/version.rb +1 -1
data/mongo.gemspec +1 -1
data/spec/README.md +13 -0
data/spec/integration/auth_spec.rb +27 -8
data/spec/integration/bson_symbol_spec.rb +34 -0
data/spec/integration/client_construction_spec.rb +14 -0
data/spec/integration/client_options_spec.rb +5 -5
data/spec/integration/connection_spec.rb +57 -9
data/spec/integration/crud_spec.rb +45 -0
data/spec/integration/cursor_reaping_spec.rb +2 -1
data/spec/integration/grid_fs_bucket_spec.rb +48 -0
data/spec/integration/retryable_errors_spec.rb +204 -39
data/spec/integration/retryable_writes_spec.rb +36 -36
data/spec/integration/size_limit_spec.rb~12e1e9c4f... RUBY-2242 Fix zlib compression (#2021) +98 -0
data/spec/lite_spec_helper.rb +1 -0
data/spec/mongo/address_spec.rb +19 -13
data/spec/mongo/auth/ldap/conversation_spec.rb +1 -1
data/spec/mongo/auth/scram/conversation_spec.rb +25 -14
data/spec/mongo/auth/user/view_spec.rb +36 -1
data/spec/mongo/auth/user_spec.rb +12 -0
data/spec/mongo/auth/x509/conversation_spec.rb +1 -1
data/spec/mongo/bulk_write_spec.rb +2 -2
data/spec/mongo/client_construction_spec.rb +1 -21
data/spec/mongo/cluster_spec.rb +57 -0
data/spec/mongo/collection/view/map_reduce_spec.rb +1 -1
data/spec/mongo/collection_spec.rb +26 -2
data/spec/mongo/cursor/builder/op_kill_cursors_spec.rb +56 -0
data/spec/mongo/server/connection_spec.rb +76 -8
data/spec/mongo/server/monitor/connection_spec.rb +14 -7
data/spec/mongo/socket/ssl_spec.rb +132 -98
data/spec/mongo/socket/tcp_spec.rb +1 -9
data/spec/mongo/uri_spec.rb +1 -1
data/spec/runners/sdam/verifier.rb +91 -0
data/spec/spec_tests/data/sdam/rs/primary_address_change.yml +29 -0
data/spec/spec_tests/data/sdam/rs/primary_mismatched_me.yml +27 -23
data/spec/spec_tests/data/sdam/rs/primary_to_no_primary_mismatched_me.yml +56 -79
data/spec/spec_tests/data/sdam/sharded/primary_address_change.yml +21 -0
data/spec/spec_tests/data/sdam/sharded/primary_mismatched_me.yml +22 -0
data/spec/spec_tests/data/sdam/single/primary_address_change.yml +24 -0
data/spec/spec_tests/data/sdam/single/primary_mismatched_me.yml +25 -0
data/spec/spec_tests/data/sdam_monitoring/replica_set_with_me_mismatch.yml +159 -0
data/spec/spec_tests/data/sdam_monitoring/{replica_set_other_seed.yml → replica_set_with_primary_change.yml} +97 -101
data/spec/spec_tests/data/sdam_monitoring/replica_set_with_primary_removal.yml +22 -18
data/spec/spec_tests/data/sdam_monitoring/standalone_to_rs_with_me_mismatch.yml +90 -0
data/spec/spec_tests/sdam_monitoring_spec.rb +9 -4
data/spec/support/cluster_config.rb +36 -0
data/spec/support/cluster_tools.rb +5 -3
data/spec/support/command_monitoring.rb +1 -1
data/spec/support/constraints.rb +18 -18
data/spec/support/lite_constraints.rb +8 -0
data/spec/support/sdam_monitoring.rb +0 -115
data/spec/support/server_discovery_and_monitoring.rb +2 -0
data/spec/support/spec_config.rb +1 -1
data/spec/support/utils.rb +11 -1
metadata +687 -659
metadata.gz.sig +3 -2

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

@@ -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 CHANGED

@@ -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 ADDED

@@ -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/spec_tests/sdam_monitoring_spec.rb CHANGED

@@ -1,5 +1,7 @@
 require 'lite_spec_helper'
+require_relative '../runners/sdam/verifier'
 describe 'SDAM Monitoring' do
   include Mongo::SDAM
@@ -72,12 +74,15 @@ describe 'SDAM Monitoring' do
             expect(@subscriber.phase_events(phase_index).length).to eq(phase.outcome.events.length)
           end
+          let(:verifier) do
+            Sdam::Verifier.new
+          end
           phase.outcome.events.each_with_index do |expectation, index|
-            it "expects a #{expectation.name} to be published" do
-              published_event = @subscriber.phase_events(phase_index)[index]
-              expect(published_event).not_to be_nil
-              expect(published_event).to match_sdam_monitoring_event(expectation)
+            it "expects event #{index+1} to be #{expectation.name}" do
+              verifier.verify_sdam_event(
+                phase.outcome.events, @subscriber.phase_events(phase_index), index)
             end
           end
         end