RubyGems - mongo - Versions diffs - 2.4.3 → 2.5.0.beta - Mend

mongo 2.4.3 → 2.5.0.beta

Files changed (235) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +3 -2
data.tar.gz.sig +0 -0
data/lib/mongo.rb +3 -2
data/lib/mongo/auth/cr.rb +6 -4
data/lib/mongo/auth/cr/conversation.rb +33 -17
data/lib/mongo/auth/ldap.rb +4 -2
data/lib/mongo/auth/ldap/conversation.rb +19 -9
data/lib/mongo/auth/scram.rb +7 -4
data/lib/mongo/auth/scram/conversation.rb +62 -24
data/lib/mongo/auth/user.rb +10 -0
data/lib/mongo/auth/user/view.rb +44 -22
data/lib/mongo/auth/x509.rb +4 -2
data/lib/mongo/auth/x509/conversation.rb +19 -9
data/lib/mongo/bulk_write.rb +33 -27
data/lib/mongo/bulk_write/combineable.rb +5 -0
data/lib/mongo/bulk_write/transformable.rb +2 -0
data/lib/mongo/bulk_write/validatable.rb +4 -0
data/lib/mongo/client.rb +123 -12
data/lib/mongo/cluster.rb +52 -11
data/lib/mongo/cluster/app_metadata.rb +8 -2
data/lib/mongo/cluster/cursor_reaper.rb +0 -1
data/lib/mongo/cluster/topology.rb +1 -1
data/lib/mongo/collection.rb +114 -27
data/lib/mongo/collection/view.rb +8 -2
data/lib/mongo/collection/view/aggregation.rb +11 -7
data/lib/mongo/collection/view/builder/aggregation.rb +5 -1
data/lib/mongo/collection/view/builder/find_command.rb +5 -3
data/lib/mongo/collection/view/builder/map_reduce.rb +11 -3
data/lib/mongo/collection/view/builder/op_query.rb +1 -1
data/lib/mongo/collection/view/change_stream.rb +160 -0
data/lib/mongo/collection/view/change_stream/retryable.rb +57 -0
data/lib/mongo/collection/view/iterable.rb +11 -10
data/lib/mongo/collection/view/map_reduce.rb +22 -18
data/lib/mongo/collection/view/readable.rb +51 -37
data/lib/mongo/collection/view/writable.rb +72 -40
data/lib/mongo/cursor.rb +25 -4
data/lib/mongo/cursor/builder/get_more_command.rb +4 -2
data/lib/mongo/database.rb +22 -11
data/lib/mongo/database/view.rb +16 -12
data/lib/mongo/error.rb +5 -0
data/lib/mongo/error/invalid_session.rb +36 -0
data/lib/mongo/error/missing_resume_token.rb +39 -0
data/lib/mongo/error/operation_failure.rb +17 -0
data/lib/mongo/error/parser.rb +3 -2
data/lib/mongo/error/unknown_payload_type.rb +41 -0
data/lib/mongo/error/unsupported_array_filters.rb +51 -0
data/lib/mongo/error/unsupported_message_type.rb +23 -0
data/lib/mongo/grid/fs_bucket.rb +5 -4
data/lib/mongo/grid/stream/read.rb +3 -2
data/lib/mongo/grid/stream/write.rb +2 -2
data/lib/mongo/index/view.rb +35 -25
data/lib/mongo/monitoring/event/secure.rb +14 -0
data/lib/mongo/operation.rb +16 -0
data/lib/mongo/operation/commands.rb +1 -0
data/lib/mongo/operation/commands/aggregate.rb +9 -5
data/lib/mongo/operation/commands/aggregate/result.rb +1 -1
data/lib/mongo/operation/commands/collections_info.rb +6 -6
data/lib/mongo/operation/commands/command.rb +2 -1
data/lib/mongo/operation/commands/create.rb +6 -2
data/lib/mongo/operation/commands/drop.rb +6 -2
data/lib/mongo/operation/commands/drop_database.rb +6 -2
data/lib/mongo/operation/commands/explain.rb +27 -0
data/lib/mongo/operation/commands/explain/result.rb +52 -0
data/lib/mongo/operation/commands/indexes.rb +1 -1
data/lib/mongo/operation/commands/list_collections.rb +1 -1
data/lib/mongo/operation/commands/list_collections/result.rb +1 -1
data/lib/mongo/operation/commands/list_indexes.rb +1 -1
data/lib/mongo/operation/commands/list_indexes/result.rb +1 -1
data/lib/mongo/operation/commands/map_reduce.rb +8 -4
data/lib/mongo/operation/commands/map_reduce/result.rb +13 -1
data/lib/mongo/operation/commands/user_query.rb +1 -1
data/lib/mongo/operation/commands/users_info.rb +6 -2
data/lib/mongo/operation/executable.rb +4 -1
data/lib/mongo/operation/read_preference.rb +10 -5
data/lib/mongo/operation/result.rb +26 -2
data/lib/mongo/operation/specifiable.rb +13 -1
data/lib/mongo/operation/uses_command_op_msg.rb +47 -0
data/lib/mongo/operation/write/bulk/bulkable.rb +4 -1
data/lib/mongo/operation/write/bulk/insert/result.rb +4 -4
data/lib/mongo/operation/write/command/create_index.rb +6 -1
data/lib/mongo/operation/write/command/delete.rb +28 -4
data/lib/mongo/operation/write/command/drop_index.rb +6 -1
data/lib/mongo/operation/write/command/insert.rb +22 -18
data/lib/mongo/operation/write/command/update.rb +24 -9
data/lib/mongo/operation/write/command/writable.rb +14 -1
data/lib/mongo/operation/write/insert.rb +4 -1
data/lib/mongo/operation/write/insert/result.rb +2 -2
data/lib/mongo/operation/write/update.rb +7 -1
data/lib/mongo/operation/write/write_command_enabled.rb +20 -3
data/lib/mongo/protocol.rb +3 -0
data/lib/mongo/protocol/bit_vector.rb +2 -2
data/lib/mongo/protocol/compressed.rb +135 -0
data/lib/mongo/protocol/delete.rb +8 -6
data/lib/mongo/protocol/get_more.rb +8 -6
data/lib/mongo/protocol/insert.rb +8 -6
data/lib/mongo/protocol/kill_cursors.rb +8 -6
data/lib/mongo/protocol/message.rb +31 -3
data/lib/mongo/protocol/msg.rb +172 -0
data/lib/mongo/protocol/query.rb +26 -6
data/lib/mongo/protocol/registry.rb +76 -0
data/lib/mongo/protocol/reply.rb +10 -5
data/lib/mongo/protocol/serializers.rb +224 -0
data/lib/mongo/protocol/update.rb +8 -6
data/lib/mongo/retryable.rb +4 -2
data/lib/mongo/server.rb +6 -3
data/lib/mongo/server/connectable.rb +1 -1
data/lib/mongo/server/connection.rb +30 -8
data/lib/mongo/server/description.rb +25 -1
data/lib/mongo/server/description/features.rb +4 -1
data/lib/mongo/server/monitor.rb +5 -0
data/lib/mongo/server/monitor/connection.rb +50 -2
data/lib/mongo/server_selector/nearest.rb +10 -4
data/lib/mongo/server_selector/primary.rb +20 -0
data/lib/mongo/server_selector/primary_preferred.rb +10 -4
data/lib/mongo/server_selector/secondary.rb +10 -4
data/lib/mongo/server_selector/secondary_preferred.rb +24 -4
data/lib/mongo/session.rb +180 -0
data/lib/mongo/session/server_session.rb +73 -0
data/lib/mongo/session/session_pool.rb +161 -0
data/lib/mongo/uri.rb +11 -0
data/lib/mongo/version.rb +1 -1
data/mongo.gemspec +2 -1
data/spec/mongo/auth/cr_spec.rb +12 -0
data/spec/mongo/auth/ldap_spec.rb +2 -0
data/spec/mongo/auth/scram/conversation_spec.rb +6 -6
data/spec/mongo/auth/scram_spec.rb +25 -1
data/spec/mongo/auth/user/view_spec.rb +268 -76
data/spec/mongo/auth/x509_spec.rb +2 -0
data/spec/mongo/bulk_write_spec.rb +435 -5
data/spec/mongo/client_spec.rb +356 -39
data/spec/mongo/cluster/app_metadata_spec.rb +2 -2
data/spec/mongo/cluster_spec.rb +176 -0
data/spec/mongo/collection/view/aggregation_spec.rb +33 -12
data/spec/mongo/collection/view/builder/find_command_spec.rb +46 -6
data/spec/mongo/collection/view/change_stream_spec.rb +814 -0
data/spec/mongo/collection/view/map_reduce_spec.rb +94 -17
data/spec/mongo/collection/view/readable_spec.rb +3 -12
data/spec/mongo/collection_spec.rb +1048 -42
data/spec/mongo/cursor/builder/get_more_command_spec.rb +19 -0
data/spec/mongo/cursor_spec.rb +2 -2
data/spec/mongo/database_spec.rb +50 -1
data/spec/mongo/grid/fs_bucket_spec.rb +225 -137
data/spec/mongo/grid/stream/read_spec.rb +2 -2
data/spec/mongo/index/view_spec.rb +146 -8
data/spec/mongo/monitoring/event/secure_spec.rb +42 -0
data/spec/mongo/operation/read/query_spec.rb +2 -1
data/spec/mongo/operation/specifiable_spec.rb +2 -2
data/spec/mongo/operation/write/command/delete_spec.rb +96 -13
data/spec/mongo/operation/write/command/insert_spec.rb +111 -12
data/spec/mongo/operation/write/command/update_spec.rb +93 -10
data/spec/mongo/operation/write/delete_spec.rb +1 -1
data/spec/mongo/operation/write/insert_spec.rb +1 -1
data/spec/mongo/operation/write/update_spec.rb +1 -1
data/spec/mongo/protocol/compressed_spec.rb +66 -0
data/spec/mongo/protocol/delete_spec.rb +14 -0
data/spec/mongo/protocol/get_more_spec.rb +14 -0
data/spec/mongo/protocol/insert_spec.rb +14 -0
data/spec/mongo/protocol/kill_cursors_spec.rb +14 -0
data/spec/mongo/protocol/msg_spec.rb +499 -0
data/spec/mongo/protocol/query_spec.rb +45 -0
data/spec/mongo/protocol/registry_spec.rb +31 -0
data/spec/mongo/protocol/reply_spec.rb +14 -0
data/spec/mongo/protocol/update_spec.rb +14 -0
data/spec/mongo/retryable_spec.rb +6 -2
data/spec/mongo/sdam_spec.rb +4 -0
data/spec/mongo/server/connection_spec.rb +4 -2
data/spec/mongo/server/description_spec.rb +28 -1
data/spec/mongo/session/server_session_spec.rb +16 -0
data/spec/mongo/session/session_pool_spec.rb +194 -0
data/spec/mongo/uri_spec.rb +31 -2
data/spec/spec_helper.rb +104 -0
data/spec/support/authorization.rb +6 -1
data/spec/support/crud.rb +3 -1
data/spec/support/crud/write.rb +6 -1
data/spec/support/crud_tests/write/findOneAndUpdate-arrayFilters.yml +69 -0
data/spec/support/crud_tests/write/updateMany-arrayFilters.yml +63 -0
data/spec/support/crud_tests/write/updateOne-arrayFilters.yml +109 -0
data/spec/support/sdam/rs/discover_arbiters.yml +1 -1
data/spec/support/sdam/rs/discover_passives.yml +2 -2
data/spec/support/sdam/rs/discover_primary.yml +1 -1
data/spec/support/sdam/rs/discover_secondary.yml +1 -1
data/spec/support/sdam/rs/discovery.yml +4 -4
data/spec/support/sdam/rs/equal_electionids.yml +1 -0
data/spec/support/sdam/rs/ghost_discovered.yml +1 -1
data/spec/support/sdam/rs/hosts_differ_from_seeds.yml +1 -1
data/spec/support/sdam/rs/ls_timeout.yml +88 -0
data/spec/support/sdam/rs/member_reconfig.yml +2 -2
data/spec/support/sdam/rs/member_standalone.yml +2 -2
data/spec/support/sdam/rs/new_primary.yml +2 -2
data/spec/support/sdam/rs/new_primary_new_electionid.yml +3 -0
data/spec/support/sdam/rs/new_primary_new_setversion.yml +3 -0
data/spec/support/sdam/rs/new_primary_wrong_set_name.yml +2 -2
data/spec/support/sdam/rs/non_rs_member.yml +1 -1
data/spec/support/sdam/rs/normalize_case.yml +1 -1
data/spec/support/sdam/rs/null_election_id.yml +4 -0
data/spec/support/sdam/rs/primary_becomes_standalone.yml +2 -2
data/spec/support/sdam/rs/primary_changes_set_name.yml +2 -2
data/spec/support/sdam/rs/primary_disconnect.yml +2 -2
data/spec/support/sdam/rs/primary_disconnect_electionid.yml +5 -0
data/spec/support/sdam/rs/primary_disconnect_setversion.yml +5 -0
data/spec/support/sdam/rs/primary_hint_from_secondary_with_mismatched_me.yml +58 -0
data/spec/support/sdam/rs/primary_reports_new_member.yml +4 -4
data/spec/support/sdam/rs/primary_to_no_primary_mismatched_me.yml +2 -2
data/spec/support/sdam/rs/primary_wrong_set_name.yml +1 -1
data/spec/support/sdam/rs/response_from_removed.yml +2 -2
data/spec/support/sdam/rs/rsother_discovered.yml +1 -1
data/spec/support/sdam/rs/sec_not_auth.yml +1 -1
data/spec/support/sdam/rs/secondary_wrong_set_name.yml +1 -1
data/spec/support/sdam/rs/secondary_wrong_set_name_with_primary.yml +2 -2
data/spec/support/sdam/rs/setversion_without_electionid.yml +2 -0
data/spec/support/sdam/rs/stepdown_change_set_name.yml +2 -2
data/spec/support/sdam/rs/unexpected_mongos.yml +1 -1
data/spec/support/sdam/rs/use_setversion_without_electionid.yml +3 -0
data/spec/support/sdam/rs/wrong_set_name.yml +1 -1
data/spec/support/sdam/sharded/ls_timeout_mongos.yml +97 -0
data/spec/support/sdam/sharded/mongos_disconnect.yml +3 -3
data/spec/support/sdam/sharded/multiple_mongoses.yml +1 -1
data/spec/support/sdam/sharded/non_mongos_removed.yml +1 -1
data/spec/support/sdam/sharded/normalize_uri_case.yml +1 -1
data/spec/support/sdam/single/direct_connection_external_ip.yml +1 -1
data/spec/support/sdam/single/direct_connection_mongos.yml +1 -1
data/spec/support/sdam/single/direct_connection_rsarbiter.yml +1 -1
data/spec/support/sdam/single/direct_connection_rsprimary.yml +1 -1
data/spec/support/sdam/single/direct_connection_rssecondary.yml +1 -1
data/spec/support/sdam/single/direct_connection_slave.yml +1 -1
data/spec/support/sdam/single/direct_connection_standalone.yml +1 -1
data/spec/support/sdam/single/ls_timeout_standalone.yml +35 -0
data/spec/support/sdam/single/not_ok_response.yml +1 -1
data/spec/support/sdam/single/standalone_removed.yml +1 -1
data/spec/support/sdam/single/unavailable_seed.yml +1 -1
data/spec/support/server_discovery_and_monitoring.rb +4 -0
data/spec/support/shared/session.rb +236 -0
metadata +53 -15
metadata.gz.sig +0 -0

data/spec/support/sdam/rs/primary_disconnect_setversion.yml CHANGED Viewed

@@ -40,6 +40,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     },
@@ -63,6 +64,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     },
@@ -93,6 +95,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     },
@@ -124,6 +127,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     },
@@ -153,6 +157,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     }

data/spec/support/sdam/rs/primary_hint_from_secondary_with_mismatched_me.yml ADDED Viewed

@@ -0,0 +1,58 @@
+description: "Secondary with mismatched 'me' tells us who the primary is"
+uri: "mongodb://a/?replicaSet=rs"
+phases: [
+    # A is a secondary with mismatched "me". Remove A, add PossiblePrimary B.
+    {
+        responses: [
+            ["a:27017", {
+                ok: 1,
+                ismaster: false,
+                secondary: true,
+                me: "c:27017",
+                hosts: ["b:27017"],
+                setName: "rs",
+                primary: "b:27017"
+            }]
+        ],
+        outcome: {
+            servers: {
+                "b:27017": {
+                    type: "PossiblePrimary",
+                    setName:
+                }
+            },
+            topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
+            setName: "rs",
+        }
+    },
+    # Discover B is primary.
+    {
+        responses: [
+            ["b:27017", {
+                ok: 1,
+                ismaster: true,
+                me: "b:27017",
+                hosts: ["b:27017"],
+                setName: "rs"
+            }]
+        ],
+        outcome: {
+            servers: {
+                "b:27017": {
+                    type: "RSPrimary",
+                    setName: "rs"
+                }
+            },
+            topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
+            setName: "rs"
+        }
+    }
+]

data/spec/support/sdam/rs/primary_reports_new_member.yml CHANGED Viewed

@@ -34,8 +34,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     },
@@ -69,8 +69,8 @@ phases: [
                     setName: "rs"
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     },
@@ -111,8 +111,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     },
@@ -155,8 +155,8 @@ phases: [
                     setName: "rs"
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/primary_to_no_primary_mismatched_me.yml CHANGED Viewed

@@ -33,8 +33,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     },
@@ -67,8 +67,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/primary_wrong_set_name.yml CHANGED Viewed

@@ -19,8 +19,8 @@ phases: [
         outcome: {
             servers: {},
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/response_from_removed.yml CHANGED Viewed

@@ -26,8 +26,8 @@ phases: [
                     setName: "rs"
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     },
@@ -55,8 +55,8 @@ phases: [
                     setName: "rs"
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/rsother_discovered.yml CHANGED Viewed

@@ -54,8 +54,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/sec_not_auth.yml CHANGED Viewed

@@ -41,8 +41,8 @@ phases: [
                     setName: "rs"
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/secondary_wrong_set_name.yml CHANGED Viewed

@@ -20,8 +20,8 @@ phases: [
         outcome: {
             servers: {},
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/secondary_wrong_set_name_with_primary.yml CHANGED Viewed

@@ -32,8 +32,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     },
@@ -61,8 +61,8 @@ phases: [
                     setName: "rs"
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/setversion_without_electionid.yml CHANGED Viewed

@@ -31,6 +31,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     },
@@ -63,6 +64,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     }

data/spec/support/sdam/rs/stepdown_change_set_name.yml CHANGED Viewed

@@ -27,8 +27,8 @@ phases: [
                     setName: "rs"
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     },
@@ -51,8 +51,8 @@ phases: [
         outcome: {
             servers: {},
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/unexpected_mongos.yml CHANGED Viewed

@@ -18,8 +18,8 @@ phases: [
         outcome: {
             servers: {},
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/rs/use_setversion_without_electionid.yml CHANGED Viewed

@@ -32,6 +32,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     },
@@ -62,6 +63,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     },
@@ -93,6 +95,7 @@ phases: [
                 }
             },
             topologyType: "ReplicaSetWithPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs",
         }
     }

data/spec/support/sdam/rs/wrong_set_name.yml CHANGED Viewed

@@ -27,8 +27,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "ReplicaSetNoPrimary",
+            logicalSessionTimeoutMinutes: null,
             setName: "rs"
         }
     }

data/spec/support/sdam/sharded/ls_timeout_mongos.yml ADDED Viewed

@@ -0,0 +1,97 @@
+description: "Parse logicalSessionTimeoutMinutes from mongoses"
+uri: "mongodb://a,b"
+phases: [
+    {
+        responses: [
+                ["a:27017", {
+                    ok: 1,
+                    ismaster: true,
+                    msg: "isdbgrid",
+                    logicalSessionTimeoutMinutes: 1,
+                    minWireVersion: 0,
+                    maxWireVersion: 6
+                }],
+                ["b:27017", {
+                    ok: 1,
+                    ismaster: true,
+                    msg: "isdbgrid",
+                    logicalSessionTimeoutMinutes: 2,
+                    minWireVersion: 0,
+                    maxWireVersion: 6
+                }]
+        ],
+        outcome: {
+            servers: {
+                "a:27017": {
+                    type: "Mongos",
+                    setName:
+                },
+                "b:27017": {
+                    type: "Mongos",
+                    setName:
+                }
+            },
+            topologyType: "Sharded",
+            logicalSessionTimeoutMinutes: 1,  # Minimum of the two
+            setName:
+        }
+    },
+    # Now an ismaster response with no logicalSessionTimeoutMinutes
+    {
+        responses: [
+                ["a:27017", {
+                    ok: 1,
+                    ismaster: true,
+                    msg: "isdbgrid",
+                    logicalSessionTimeoutMinutes: 1,
+                    minWireVersion: 0,
+                    maxWireVersion: 6
+                }],
+                ["b:27017", {
+                    ok: 1,
+                    ismaster: true,
+                    msg: "isdbgrid",
+                    minWireVersion: 0,
+                    maxWireVersion: 6
+                }]
+        ],
+        outcome: {
+            servers: {
+                "a:27017": {
+                    type: "Mongos",
+                    setName:
+                },
+                "b:27017": {
+                    type: "Mongos",
+                    setName:
+                }
+            },
+            topologyType: "Sharded",
+            logicalSessionTimeoutMinutes: null,  # Sessions not supported now
+            setName:
+        }
+    }
+]

data/spec/support/sdam/sharded/mongos_disconnect.yml CHANGED Viewed

@@ -38,8 +38,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "Sharded",
+            logicalSessionTimeoutMinutes: null,
             setName:
         }
     },
@@ -64,8 +64,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "Sharded",
+            logicalSessionTimeoutMinutes: null,
             setName:
         }
     },
@@ -96,8 +96,8 @@ phases: [
                     setName:
                 }
             },
             topologyType: "Sharded",
+            logicalSessionTimeoutMinutes: null,
             setName:
         }
     }