diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index 1e9745160ef..e8d9e09992f 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -1771,10 +1771,6 @@ axes: display_name: "4.2" variables: VERSION: "4.2" - - id: "4.0" - display_name: "4.0" - variables: - VERSION: "4.0" - id: os display_name: OS @@ -2309,7 +2305,7 @@ buildvariants: - name: test-net60 - matrix_name: "secure-tests-linux-1804" - matrix_spec: { version: ["4.0", "4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-1804" } + matrix_spec: { version: ["4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-1804" } display_name: "${version} ${topology} ${auth} ${ssl} ${os}" tags: ["tests-variant"] tasks: @@ -2344,7 +2340,7 @@ buildvariants: - name: test-net60 - matrix_name: "unsecure-tests-linux-1804" - matrix_spec: { version: ["4.0", "4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-1804" } + matrix_spec: { version: ["4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-1804" } display_name: "${version} ${topology} ${auth} ${ssl} ${os}" tags: ["tests-variant"] tasks: @@ -2379,7 +2375,7 @@ buildvariants: - name: test-net60 - matrix_name: "tests-compression-linux-1804" - matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["4.0", "4.2", "4.4", "5.0", "6.0"], topology: "standalone", os: "ubuntu-1804" } + matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0"], topology: "standalone", os: "ubuntu-1804" } display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} " tags: ["tests-variant"] tasks: diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json index 5afebbbdcb2..db8b061b303 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json @@ -7,7 +7,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -37,7 +37,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -49,7 +49,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -63,7 +63,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml index 5f9750ef7be..793aa10eaaa 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml @@ -8,14 +8,14 @@ topology_description: type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/LastUpdateTime.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/LastUpdateTime.json index 492d8a2f625..10b6f287865 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/LastUpdateTime.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/LastUpdateTime.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] } diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/LastUpdateTime.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/LastUpdateTime.yml index 8bb42d8c621..20169417131 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/LastUpdateTime.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/LastUpdateTime.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 1 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 25002 # Not used when there's no primary. lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. - maxWireVersion: 6 + maxWireVersion: 21 - &3 address: c:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 25001 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest.json index 6602561c1dc..38b9986500d 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] } diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest.yml index 7c3fbe5eba7..783831f4771 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. - maxWireVersion: 6 + maxWireVersion: 21 - &3 address: c:27017 avg_rtt_ms: 5 lastUpdateTime: 0 type: RSSecondary lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest2.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest2.json index 16d9a673bd8..586b47ccd2b 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest2.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest2.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] } diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest2.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest2.yml index e162f04c93c..867b7706a4a 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest2.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Nearest2.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. - maxWireVersion: 6 + maxWireVersion: 21 - &3 address: c:27017 avg_rtt_ms: 5 lastUpdateTime: 0 type: RSSecondary lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json index 54f318872fa..15a62090e3f 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json @@ -17,7 +17,7 @@ { "address": "c:27017", "type": "RSSecondary", - "maxWireVersion": 6, + "maxWireVersion": 21, "avg_rtt_ms": 5, "lastWrite": { "lastWriteDate": { @@ -35,7 +35,7 @@ { "address": "c:27017", "type": "RSSecondary", - "maxWireVersion": 6, + "maxWireVersion": 21, "avg_rtt_ms": 5, "lastWrite": { "lastWriteDate": { @@ -48,7 +48,7 @@ { "address": "c:27017", "type": "RSSecondary", - "maxWireVersion": 6, + "maxWireVersion": 21, "avg_rtt_ms": 5, "lastWrite": { "lastWriteDate": { diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml index c1d3b502b86..ccbec183cac 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml @@ -15,7 +15,7 @@ topology_description: - &3 address: c:27017 type: RSSecondary - maxWireVersion: 6 + maxWireVersion: 21 avg_rtt_ms: 5 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred.json index 7956b8e516d..7c036f725c5 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred.json @@ -8,7 +8,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -39,7 +39,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -53,7 +53,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred.yml index b4706e55232..c01aff6f799 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred.yml @@ -9,14 +9,14 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: PrimaryPreferred diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred_tags.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred_tags.json index 453dce6605a..56fcb156bb8 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred_tags.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred_tags.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } @@ -28,7 +28,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "nyc" } @@ -58,7 +58,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } @@ -75,7 +75,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml index cd285d5fafa..a5df80ff36c 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml @@ -12,7 +12,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 tags: data_center: tokyo # Matches second tag set. - &2 @@ -21,7 +21,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 tags: data_center: nyc read_preference: diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Secondary.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Secondary.json index b383f275dc4..5a4b0c82260 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Secondary.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Secondary.json @@ -8,7 +8,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "125002" @@ -23,7 +23,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -38,7 +38,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -53,7 +53,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -80,7 +80,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -97,7 +97,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Secondary.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Secondary.yml index 88c5ab549db..93e81841b4f 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/Secondary.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/Secondary.yml @@ -9,7 +9,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "125002"}} tags: data_center: tokyo # No match, but its lastWriteDate is used in estimate. @@ -18,7 +18,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. tags: data_center: nyc @@ -27,7 +27,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. tags: data_center: nyc @@ -36,7 +36,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} tags: data_center: tokyo # No match. diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred.json index 7bce7d0aa42..19a948e928d 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred.json @@ -7,7 +7,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -38,7 +38,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -52,7 +52,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred.yml index 0860a568ea1..f997882bc0a 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred.yml @@ -8,14 +8,14 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: SecondaryPreferred diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred_tags.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred_tags.json index 32c9ca770bd..b4633d88f37 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred_tags.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred_tags.json @@ -8,7 +8,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "125002" @@ -23,7 +23,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -38,7 +38,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -53,7 +53,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -80,7 +80,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -97,7 +97,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml index 5a13cc73237..f4a6c8f6b64 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml @@ -9,7 +9,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "125002"}} tags: data_center: tokyo # No match, but its lastWriteDate is used in estimate. @@ -18,7 +18,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. tags: data_center: nyc @@ -27,7 +27,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. tags: data_center: nyc @@ -36,7 +36,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} tags: data_center: tokyo # No match. diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/ZeroMaxStaleness.json b/specifications/max-staleness/tests/ReplicaSetNoPrimary/ZeroMaxStaleness.json index fd84cd11931..ccb916f1072 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/ZeroMaxStaleness.json +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/ZeroMaxStaleness.json @@ -7,7 +7,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetNoPrimary/ZeroMaxStaleness.yml b/specifications/max-staleness/tests/ReplicaSetNoPrimary/ZeroMaxStaleness.yml index e37f6b20b1b..e6be41ca673 100644 --- a/specifications/max-staleness/tests/ReplicaSetNoPrimary/ZeroMaxStaleness.yml +++ b/specifications/max-staleness/tests/ReplicaSetNoPrimary/ZeroMaxStaleness.yml @@ -8,14 +8,14 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json index 35eaa9d69d6..00137cf69e5 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json @@ -7,7 +7,7 @@ "type": "RSPrimary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -37,7 +37,7 @@ "type": "RSPrimary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -49,7 +49,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -63,7 +63,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml index 67cc8949318..1ea9b209c8f 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml @@ -8,14 +8,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LastUpdateTime.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LastUpdateTime.json index 18450beaedd..9d1db2de65d 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LastUpdateTime.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LastUpdateTime.json @@ -13,7 +13,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] } diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LastUpdateTime.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LastUpdateTime.yml index 694178bbd74..e4fbe1ff7d1 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LastUpdateTime.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LastUpdateTime.yml @@ -8,7 +8,7 @@ topology_description: avg_rtt_ms: 50 # Too far. lastUpdateTime: 1 lastWrite: {lastWriteDate: {$numberLong: "2"}} - maxWireVersion: 6 + maxWireVersion: 21 - &2 address: b:27017 type: RSSecondary @@ -17,14 +17,14 @@ topology_description: # Updated 125 sec after primary, so 125 sec stale. # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. lastWrite: {lastWriteDate: {$numberLong: "2"}} - maxWireVersion: 6 + maxWireVersion: 21 - &3 address: c:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 125001 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat.json index b9fb407f9e8..b0636236cc8 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -39,7 +39,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -51,7 +51,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -65,7 +65,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat.yml index 89cab474442..1e479c32e09 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat.yml @@ -10,14 +10,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat2.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat2.json index b695e1caeb2..76edfcb836a 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat2.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat2.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat2.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat2.yml index c849a0eff98..836467bf1f7 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat2.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/LongHeartbeat2.yml @@ -10,14 +10,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessTooSmall.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessTooSmall.json index 9b798d37da1..aa936e3c67a 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessTooSmall.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessTooSmall.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml index 82c8f81ae55..9edd4199bf6 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml @@ -11,14 +11,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json index 1fa7bb4dd06..c24752a7f12 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json @@ -7,7 +7,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml index dd62017011e..92358a702dd 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml @@ -9,14 +9,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: maxStalenessSeconds: 120 diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest.json index 198be4a681d..d3a9535b093 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] } diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest.yml index 96eeb4b5592..5ef6c720a5e 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. - maxWireVersion: 6 + maxWireVersion: 21 - &3 address: c:27017 avg_rtt_ms: 5 lastUpdateTime: 0 type: RSSecondary lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest2.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest2.json index 3ae629c898b..f91706e8040 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest2.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest2.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] } diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest2.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest2.yml index 3ee119c3a73..7d4f706fc7a 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest2.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest2.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. - maxWireVersion: 6 + maxWireVersion: 21 - &3 address: c:27017 avg_rtt_ms: 5 lastUpdateTime: 0 type: RSSecondary lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest_tags.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest_tags.json index 675df82631b..4ed0b9ed2ea 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest_tags.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest_tags.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } @@ -28,7 +28,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "nyc" } @@ -58,7 +58,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } @@ -75,7 +75,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest_tags.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest_tags.yml index ce2c3ab3f07..6db5d4362b5 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest_tags.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Nearest_tags.yml @@ -12,7 +12,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 tags: data_center: tokyo - &2 @@ -21,7 +21,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 tags: data_center: nyc read_preference: diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/PrimaryPreferred.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/PrimaryPreferred.json index 795b47a1115..7945530e6a9 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/PrimaryPreferred.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/PrimaryPreferred.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -39,7 +39,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -53,7 +53,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/PrimaryPreferred.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/PrimaryPreferred.yml index c1594c410f8..e38f33d7c1a 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/PrimaryPreferred.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/PrimaryPreferred.yml @@ -9,14 +9,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: PrimaryPreferred diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred.json index 5455708a70b..b433d6a4303 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred.json @@ -7,7 +7,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -38,7 +38,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -52,7 +52,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred.yml index 33c25f41297..ff35b9bdabf 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred.yml @@ -8,14 +8,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: SecondaryPreferred diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags.json index 6670b54c892..e594af78320 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "125002" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -35,7 +35,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 1, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -50,7 +50,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -65,7 +65,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -92,7 +92,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -107,7 +107,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 1, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -124,7 +124,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml index 05301d21095..4d17a4d7fd9 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml @@ -9,14 +9,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. tags: data_center: nyc @@ -25,7 +25,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 1 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} # Not used in estimate since we have a primary. tags: data_center: nyc @@ -34,7 +34,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. tags: data_center: nyc @@ -43,7 +43,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} tags: data_center: tokyo # No match. diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json index 642fee1fb30..bc0953c6574 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } @@ -40,7 +40,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "nyc" } @@ -70,7 +70,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } @@ -87,7 +87,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml index 00ed08c0af5..82c5a799f7c 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml @@ -12,14 +12,14 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "2"}} - maxWireVersion: 6 + maxWireVersion: 21 tags: data_center: tokyo - &3 @@ -28,7 +28,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 tags: data_center: nyc read_preference: diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags.json index 502120dce67..2817cf9225b 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "125002" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -35,7 +35,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 1, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -50,7 +50,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -65,7 +65,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -92,7 +92,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -107,7 +107,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 1, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -124,7 +124,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags.yml index 50650fea844..721cbc8a5db 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags.yml @@ -9,14 +9,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} # 125 sec stale + 25 sec heartbeat <= 150 sec maxStaleness. tags: data_center: nyc @@ -25,7 +25,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 1 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} # Not used in estimate since we have a primary. tags: data_center: nyc @@ -34,7 +34,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. tags: data_center: nyc @@ -43,7 +43,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} tags: data_center: tokyo # No match. diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags2.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags2.json index 6978a1807b8..7aa487a078e 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags2.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags2.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 6 + "maxWireVersion": 21 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } @@ -40,7 +40,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "nyc" } @@ -70,7 +70,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } @@ -87,7 +87,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 6, + "maxWireVersion": 21, "tags": { "data_center": "tokyo" } diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags2.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags2.yml index b48ae682bd5..669ec5bb560 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags2.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/Secondary_tags2.yml @@ -12,14 +12,14 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 6 + maxWireVersion: 21 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "2"}} - maxWireVersion: 6 + maxWireVersion: 21 tags: data_center: tokyo - &3 @@ -28,7 +28,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 6 + maxWireVersion: 21 tags: data_center: nyc read_preference: diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/ZeroMaxStaleness.json b/specifications/max-staleness/tests/ReplicaSetWithPrimary/ZeroMaxStaleness.json index e1e4a7ffb73..fff5609fcc6 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/ZeroMaxStaleness.json +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/ZeroMaxStaleness.json @@ -7,7 +7,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/ReplicaSetWithPrimary/ZeroMaxStaleness.yml b/specifications/max-staleness/tests/ReplicaSetWithPrimary/ZeroMaxStaleness.yml index 1c2caf8e00e..18790394e7e 100644 --- a/specifications/max-staleness/tests/ReplicaSetWithPrimary/ZeroMaxStaleness.yml +++ b/specifications/max-staleness/tests/ReplicaSetWithPrimary/ZeroMaxStaleness.yml @@ -8,14 +8,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "2"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/Sharded/SmallMaxStaleness.json b/specifications/max-staleness/tests/Sharded/SmallMaxStaleness.json index 91d89720d10..98e05be3635 100644 --- a/specifications/max-staleness/tests/Sharded/SmallMaxStaleness.json +++ b/specifications/max-staleness/tests/Sharded/SmallMaxStaleness.json @@ -8,7 +8,7 @@ "type": "Mongos", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "Mongos", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -39,7 +39,7 @@ "type": "Mongos", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -51,7 +51,7 @@ "type": "Mongos", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -65,7 +65,7 @@ "type": "Mongos", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/Sharded/SmallMaxStaleness.yml b/specifications/max-staleness/tests/Sharded/SmallMaxStaleness.yml index 5ee1e079df3..9d5034df1e7 100644 --- a/specifications/max-staleness/tests/Sharded/SmallMaxStaleness.yml +++ b/specifications/max-staleness/tests/Sharded/SmallMaxStaleness.yml @@ -9,14 +9,14 @@ topology_description: type: Mongos avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: Mongos avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/Single/SmallMaxStaleness.json b/specifications/max-staleness/tests/Single/SmallMaxStaleness.json index b8d2db24be7..d948739855f 100644 --- a/specifications/max-staleness/tests/Single/SmallMaxStaleness.json +++ b/specifications/max-staleness/tests/Single/SmallMaxStaleness.json @@ -8,7 +8,7 @@ "type": "Standalone", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -27,7 +27,7 @@ "type": "Standalone", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -41,7 +41,7 @@ "type": "Standalone", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 6, + "maxWireVersion": 21, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/specifications/max-staleness/tests/Single/SmallMaxStaleness.yml b/specifications/max-staleness/tests/Single/SmallMaxStaleness.yml index 40f63a82a5f..3cba2ae55cc 100644 --- a/specifications/max-staleness/tests/Single/SmallMaxStaleness.yml +++ b/specifications/max-staleness/tests/Single/SmallMaxStaleness.yml @@ -9,7 +9,7 @@ topology_description: type: Standalone avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 6 + maxWireVersion: 21 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/specifications/max-staleness/tests/Unknown/SmallMaxStaleness.json b/specifications/max-staleness/tests/Unknown/SmallMaxStaleness.json index 8d69f46a1ea..0e609bcf940 100644 --- a/specifications/max-staleness/tests/Unknown/SmallMaxStaleness.json +++ b/specifications/max-staleness/tests/Unknown/SmallMaxStaleness.json @@ -6,7 +6,7 @@ { "address": "a:27017", "type": "Unknown", - "maxWireVersion": 6 + "maxWireVersion": 21 } ] }, diff --git a/specifications/max-staleness/tests/Unknown/SmallMaxStaleness.yml b/specifications/max-staleness/tests/Unknown/SmallMaxStaleness.yml index 59e14db3623..5d420637652 100644 --- a/specifications/max-staleness/tests/Unknown/SmallMaxStaleness.yml +++ b/specifications/max-staleness/tests/Unknown/SmallMaxStaleness.yml @@ -7,7 +7,7 @@ topology_description: - &1 address: a:27017 type: Unknown - maxWireVersion: 6 + maxWireVersion: 21 read_preference: mode: Nearest maxStalenessSeconds: 1 diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedAtShutdown.json b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedAtShutdown.json deleted file mode 100644 index 9f6ea212e5c..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedAtShutdown.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "description": "Pre-4.2 InterruptedAtShutdown error", - "uri": "mongodb://a/?replicaSet=rs", - "phases": [ - { - "description": "Primary A is discovered", - "responses": [ - [ - "a:27017", - { - "ok": 1, - "helloOk": true, - "isWritablePrimary": true, - "hosts": [ - "a:27017" - ], - "setName": "rs", - "minWireVersion": 0, - "maxWireVersion": 7 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs", - "topologyVersion": null, - "pool": { - "generation": 0 - } - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "description": "Pre-4.2 InterruptedAtShutdown error marks server Unknown and clears the pool", - "applicationErrors": [ - { - "address": "a:27017", - "when": "afterHandshakeCompletes", - "maxWireVersion": 7, - "type": "command", - "response": { - "ok": 0, - "errmsg": "InterruptedAtShutdown", - "code": 11600 - } - } - ], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "topologyVersion": null, - "pool": { - "generation": 1 - } - } - }, - "topologyType": "ReplicaSetNoPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedAtShutdown.yml b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedAtShutdown.yml deleted file mode 100644 index 4996e9f25ff..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedAtShutdown.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 InterruptedAtShutdown error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 InterruptedAtShutdown error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: InterruptedAtShutdown - code: 11600 - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedDueToReplStateChange.json b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedDueToReplStateChange.json deleted file mode 100644 index 7e5f2357134..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedDueToReplStateChange.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "description": "Pre-4.2 InterruptedDueToReplStateChange error", - "uri": "mongodb://a/?replicaSet=rs", - "phases": [ - { - "description": "Primary A is discovered", - "responses": [ - [ - "a:27017", - { - "ok": 1, - "helloOk": true, - "isWritablePrimary": true, - "hosts": [ - "a:27017" - ], - "setName": "rs", - "minWireVersion": 0, - "maxWireVersion": 7 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs", - "topologyVersion": null, - "pool": { - "generation": 0 - } - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "description": "Pre-4.2 InterruptedDueToReplStateChange error marks server Unknown and clears the pool", - "applicationErrors": [ - { - "address": "a:27017", - "when": "afterHandshakeCompletes", - "maxWireVersion": 7, - "type": "command", - "response": { - "ok": 0, - "errmsg": "InterruptedDueToReplStateChange", - "code": 11602 - } - } - ], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "topologyVersion": null, - "pool": { - "generation": 1 - } - } - }, - "topologyType": "ReplicaSetNoPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedDueToReplStateChange.yml b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedDueToReplStateChange.yml deleted file mode 100644 index ada5f1ff736..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-InterruptedDueToReplStateChange.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 InterruptedDueToReplStateChange error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 InterruptedDueToReplStateChange error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: InterruptedDueToReplStateChange - code: 11602 - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-LegacyNotPrimary.json b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-LegacyNotPrimary.json deleted file mode 100644 index 1635f1a8568..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-LegacyNotPrimary.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "description": "Pre-4.2 LegacyNotPrimary error", - "uri": "mongodb://a/?replicaSet=rs", - "phases": [ - { - "description": "Primary A is discovered", - "responses": [ - [ - "a:27017", - { - "ok": 1, - "helloOk": true, - "isWritablePrimary": true, - "hosts": [ - "a:27017" - ], - "setName": "rs", - "minWireVersion": 0, - "maxWireVersion": 7 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs", - "topologyVersion": null, - "pool": { - "generation": 0 - } - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "description": "Pre-4.2 LegacyNotPrimary error marks server Unknown and clears the pool", - "applicationErrors": [ - { - "address": "a:27017", - "when": "afterHandshakeCompletes", - "maxWireVersion": 7, - "type": "command", - "response": { - "ok": 0, - "errmsg": "LegacyNotPrimary", - "code": 10058 - } - } - ], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "topologyVersion": null, - "pool": { - "generation": 1 - } - } - }, - "topologyType": "ReplicaSetNoPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-LegacyNotPrimary.yml b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-LegacyNotPrimary.yml deleted file mode 100644 index e2b37b4f5f1..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-LegacyNotPrimary.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 LegacyNotPrimary error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 LegacyNotPrimary error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: LegacyNotPrimary - code: 10058 - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryNoSecondaryOk.json b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryNoSecondaryOk.json deleted file mode 100644 index 0e70ede02c9..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryNoSecondaryOk.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "description": "Pre-4.2 NotPrimaryNoSecondaryOk error", - "uri": "mongodb://a/?replicaSet=rs", - "phases": [ - { - "description": "Primary A is discovered", - "responses": [ - [ - "a:27017", - { - "ok": 1, - "helloOk": true, - "isWritablePrimary": true, - "hosts": [ - "a:27017" - ], - "setName": "rs", - "minWireVersion": 0, - "maxWireVersion": 7 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs", - "topologyVersion": null, - "pool": { - "generation": 0 - } - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "description": "Pre-4.2 NotPrimaryNoSecondaryOk error marks server Unknown and clears the pool", - "applicationErrors": [ - { - "address": "a:27017", - "when": "afterHandshakeCompletes", - "maxWireVersion": 7, - "type": "command", - "response": { - "ok": 0, - "errmsg": "NotPrimaryNoSecondaryOk", - "code": 13435 - } - } - ], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "topologyVersion": null, - "pool": { - "generation": 1 - } - } - }, - "topologyType": "ReplicaSetNoPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryNoSecondaryOk.yml b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryNoSecondaryOk.yml deleted file mode 100644 index 867b7d3dc15..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryNoSecondaryOk.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 NotPrimaryNoSecondaryOk error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 NotPrimaryNoSecondaryOk error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: NotPrimaryNoSecondaryOk - code: 13435 - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryOrSecondary.json b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryOrSecondary.json deleted file mode 100644 index 3fefb216634..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryOrSecondary.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "description": "Pre-4.2 NotPrimaryOrSecondary error", - "uri": "mongodb://a/?replicaSet=rs", - "phases": [ - { - "description": "Primary A is discovered", - "responses": [ - [ - "a:27017", - { - "ok": 1, - "helloOk": true, - "isWritablePrimary": true, - "hosts": [ - "a:27017" - ], - "setName": "rs", - "minWireVersion": 0, - "maxWireVersion": 7 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs", - "topologyVersion": null, - "pool": { - "generation": 0 - } - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "description": "Pre-4.2 NotPrimaryOrSecondary error marks server Unknown and clears the pool", - "applicationErrors": [ - { - "address": "a:27017", - "when": "afterHandshakeCompletes", - "maxWireVersion": 7, - "type": "command", - "response": { - "ok": 0, - "errmsg": "NotPrimaryOrSecondary", - "code": 13436 - } - } - ], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "topologyVersion": null, - "pool": { - "generation": 1 - } - } - }, - "topologyType": "ReplicaSetNoPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryOrSecondary.yml b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryOrSecondary.yml deleted file mode 100644 index 705e2339c01..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotPrimaryOrSecondary.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 NotPrimaryOrSecondary error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 NotPrimaryOrSecondary error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: NotPrimaryOrSecondary - code: 13436 - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotWritablePrimary.json b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotWritablePrimary.json deleted file mode 100644 index d010da0a5bc..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotWritablePrimary.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "description": "Pre-4.2 NotWritablePrimary error", - "uri": "mongodb://a/?replicaSet=rs", - "phases": [ - { - "description": "Primary A is discovered", - "responses": [ - [ - "a:27017", - { - "ok": 1, - "helloOk": true, - "isWritablePrimary": true, - "hosts": [ - "a:27017" - ], - "setName": "rs", - "minWireVersion": 0, - "maxWireVersion": 7 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs", - "topologyVersion": null, - "pool": { - "generation": 0 - } - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "description": "Pre-4.2 NotWritablePrimary error marks server Unknown and clears the pool", - "applicationErrors": [ - { - "address": "a:27017", - "when": "afterHandshakeCompletes", - "maxWireVersion": 7, - "type": "command", - "response": { - "ok": 0, - "errmsg": "NotWritablePrimary", - "code": 10107 - } - } - ], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "topologyVersion": null, - "pool": { - "generation": 1 - } - } - }, - "topologyType": "ReplicaSetNoPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotWritablePrimary.yml b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotWritablePrimary.yml deleted file mode 100644 index 29669ff336e..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-NotWritablePrimary.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 NotWritablePrimary error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 NotWritablePrimary error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: NotWritablePrimary - code: 10107 - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-PrimarySteppedDown.json b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-PrimarySteppedDown.json deleted file mode 100644 index 02956d201dd..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-PrimarySteppedDown.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "description": "Pre-4.2 PrimarySteppedDown error", - "uri": "mongodb://a/?replicaSet=rs", - "phases": [ - { - "description": "Primary A is discovered", - "responses": [ - [ - "a:27017", - { - "ok": 1, - "helloOk": true, - "isWritablePrimary": true, - "hosts": [ - "a:27017" - ], - "setName": "rs", - "minWireVersion": 0, - "maxWireVersion": 7 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs", - "topologyVersion": null, - "pool": { - "generation": 0 - } - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "description": "Pre-4.2 PrimarySteppedDown error marks server Unknown and clears the pool", - "applicationErrors": [ - { - "address": "a:27017", - "when": "afterHandshakeCompletes", - "maxWireVersion": 7, - "type": "command", - "response": { - "ok": 0, - "errmsg": "PrimarySteppedDown", - "code": 189 - } - } - ], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "topologyVersion": null, - "pool": { - "generation": 1 - } - } - }, - "topologyType": "ReplicaSetNoPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-PrimarySteppedDown.yml b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-PrimarySteppedDown.yml deleted file mode 100644 index 9176ee25c3f..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-PrimarySteppedDown.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 PrimarySteppedDown error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 PrimarySteppedDown error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: PrimarySteppedDown - code: 189 - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-ShutdownInProgress.json b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-ShutdownInProgress.json deleted file mode 100644 index fc3a5aa6fee..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-ShutdownInProgress.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "description": "Pre-4.2 ShutdownInProgress error", - "uri": "mongodb://a/?replicaSet=rs", - "phases": [ - { - "description": "Primary A is discovered", - "responses": [ - [ - "a:27017", - { - "ok": 1, - "helloOk": true, - "isWritablePrimary": true, - "hosts": [ - "a:27017" - ], - "setName": "rs", - "minWireVersion": 0, - "maxWireVersion": 7 - } - ] - ], - "outcome": { - "servers": { - "a:27017": { - "type": "RSPrimary", - "setName": "rs", - "topologyVersion": null, - "pool": { - "generation": 0 - } - } - }, - "topologyType": "ReplicaSetWithPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - }, - { - "description": "Pre-4.2 ShutdownInProgress error marks server Unknown and clears the pool", - "applicationErrors": [ - { - "address": "a:27017", - "when": "afterHandshakeCompletes", - "maxWireVersion": 7, - "type": "command", - "response": { - "ok": 0, - "errmsg": "ShutdownInProgress", - "code": 91 - } - } - ], - "outcome": { - "servers": { - "a:27017": { - "type": "Unknown", - "topologyVersion": null, - "pool": { - "generation": 1 - } - } - }, - "topologyType": "ReplicaSetNoPrimary", - "logicalSessionTimeoutMinutes": null, - "setName": "rs" - } - } - ] -} diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-ShutdownInProgress.yml b/specifications/server-discovery-and-monitoring/tests/errors/pre-42-ShutdownInProgress.yml deleted file mode 100644 index 5c64050e591..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42-ShutdownInProgress.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 ShutdownInProgress error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 ShutdownInProgress error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: ShutdownInProgress - code: 91 - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/errors/pre-42.yml.template b/specifications/server-discovery-and-monitoring/tests/errors/pre-42.yml.template deleted file mode 100644 index 7449f68c163..00000000000 --- a/specifications/server-discovery-and-monitoring/tests/errors/pre-42.yml.template +++ /dev/null @@ -1,47 +0,0 @@ -# Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 {error_name} error -uri: mongodb://a/?replicaSet=rs -phases: -- description: Primary A is discovered - responses: - - - a:27017 - - ok: 1 - helloOk: true - isWritablePrimary: true - hosts: - - a:27017 - setName: rs - minWireVersion: 0 - maxWireVersion: 7 - outcome: &outcome - servers: - a:27017: - type: RSPrimary - setName: rs - topologyVersion: null - pool: - generation: 0 - topologyType: ReplicaSetWithPrimary - logicalSessionTimeoutMinutes: null - setName: rs - -- description: Pre-4.2 {error_name} error marks server Unknown and clears the pool - applicationErrors: - - address: a:27017 - when: afterHandshakeCompletes - maxWireVersion: 7 - type: command - response: - ok: 0 - errmsg: {error_name} - code: {error_code} - outcome: - servers: - a:27017: - type: Unknown - topologyVersion: null - pool: - generation: 1 - topologyType: ReplicaSetNoPrimary - logicalSessionTimeoutMinutes: null - setName: rs diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.json b/specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.json index dd8f7fc51ea..097203694ea 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.json +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.yml b/specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.yml index 5d808f2600e..1de96154ccc 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.yml +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/discovered_standalone.yml @@ -5,7 +5,7 @@ phases: responses: - - "a:27017" - - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 } + - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 21 } outcome: events: diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_no_primary.json b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_no_primary.json index 950e32efe11..41d048729da 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_no_primary.json +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_no_primary.json @@ -19,7 +19,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_no_primary.yml b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_no_primary.yml index ce9cdf46e64..e5ca9cd90d6 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_no_primary.yml +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_no_primary.yml @@ -17,7 +17,7 @@ phases: - "a:27017" - "b:27017" minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: events: - diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_primary.json b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_primary.json index 2ad94d6e6af..3ccc127d1d6 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_primary.json +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_primary.json @@ -18,7 +18,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_primary.yml b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_primary.yml index 2c789190637..256895bb28a 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_primary.yml +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_primary.yml @@ -16,7 +16,7 @@ phases: - "a:27017" - "b:27017" minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: events: - diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.json b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.json index ae28faa30cc..dc6fbe7e7d8 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.json +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.json @@ -69,7 +69,7 @@ "a:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.yml b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.yml index 2471f47680c..25c006861a4 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.yml +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/replica_set_with_removal.yml @@ -50,7 +50,7 @@ phases: primary: "a:27017", hosts: [ "a:27017" ], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 } - - "b:27017" diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.json b/specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.json index 401c5d99c56..1f4e5c1d715 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.json +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.json @@ -18,7 +18,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.yml b/specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.yml index 7a060128f37..69d0500de1e 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.yml +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/required_replica_set.yml @@ -14,7 +14,7 @@ phases: primary: "a:27017", hosts: [ "a:27017", "b:27017" ], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 } outcome: events: diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/standalone.json b/specifications/server-discovery-and-monitoring/tests/monitoring/standalone.json index 821a1525d41..f375a383ca2 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/standalone.json +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/standalone.yml b/specifications/server-discovery-and-monitoring/tests/monitoring/standalone.yml index d9f6bcfaf31..0c3ed64601f 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/standalone.yml +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/standalone.yml @@ -5,7 +5,7 @@ phases: responses: - - "a:27017" - - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 } + - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 21 } outcome: events: diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.json b/specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.json index 5958e2d26c7..4d046ff8ed6 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.json +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -21,7 +21,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.yml b/specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.yml index f2f83ffbace..255ec2dd434 100644 --- a/specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.yml +++ b/specifications/server-discovery-and-monitoring/tests/monitoring/standalone_suppress_equal_description_changes.yml @@ -5,10 +5,10 @@ phases: responses: - - "a:27017" - - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 } + - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 21 } - - "a:27017" - - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 } + - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 21 } outcome: events: diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters.json index 53709b0cee9..803462b1561 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters.yml index 67d29eadb54..5334bc82413 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters.yml @@ -16,7 +16,7 @@ phases: [ arbiters: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters_replicaset.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters_replicaset.json index 64fb49f4fcd..e58d7c7fb4c 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters_replicaset.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters_replicaset.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters_replicaset.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters_replicaset.yml index c7edb52b018..882dbb0f896 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters_replicaset.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_arbiters_replicaset.yml @@ -16,7 +16,7 @@ phases: [ arbiters: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost.json index 2e24c83e0b7..3b7fc836ec1 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost.json @@ -12,7 +12,7 @@ "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost.yml index e613f684b46..7a9cbd55594 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost_replicaset.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost_replicaset.json index cf5fe83a542..1a8457983b2 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost_replicaset.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost_replicaset.json @@ -12,7 +12,7 @@ "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost_replicaset.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost_replicaset.yml index 75ec3e64a9b..61ba1eab56a 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost_replicaset.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_ghost_replicaset.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden.json index e4a90f1f9cd..10bd51edebd 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden.yml index 64ed1d82b96..f483255802a 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden.yml @@ -17,7 +17,7 @@ phases: [ hosts: ["c:27017", "d:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden_replicaset.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden_replicaset.json index 04420596f00..63cf5586757 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden_replicaset.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden_replicaset.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden_replicaset.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden_replicaset.yml index 614a39d4826..8d496544d27 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden_replicaset.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_hidden_replicaset.yml @@ -17,7 +17,7 @@ phases: [ hosts: ["c:27017", "d:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_passives.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_passives.json index 30258409f64..0a292c675c2 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_passives.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_passives.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -56,7 +56,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_passives.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_passives.yml index 637d86d7f15..25419733cf4 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_passives.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_passives.yml @@ -16,7 +16,7 @@ phases: [ passives: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -55,7 +55,7 @@ phases: [ passives: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_passives_replicaset.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_passives_replicaset.json index 266eaa52344..c48fd476251 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_passives_replicaset.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_passives_replicaset.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -56,7 +56,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_passives_replicaset.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_passives_replicaset.yml index a5ced995d31..d981280a2ff 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_passives_replicaset.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_passives_replicaset.yml @@ -16,7 +16,7 @@ phases: [ passives: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -55,7 +55,7 @@ phases: [ passives: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_primary.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_primary.json index 2d1292bbd47..04e7a4984c8 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_primary.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_primary.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_primary.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_primary.yml index eaedf130ba1..3c11e3e4f20 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_primary.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_primary.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_primary_replicaset.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_primary_replicaset.json index 54dfefba5fd..3cdcfdcee2d 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_primary_replicaset.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_primary_replicaset.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_primary_replicaset.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_primary_replicaset.yml index 7879701bb25..47831fa60ab 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_primary_replicaset.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_primary_replicaset.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother.json index 4ab25667f01..9c3b8d8b7dd 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother.json @@ -17,7 +17,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother.yml index d78e70c5d72..11c65863f41 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother.yml @@ -16,7 +16,7 @@ phases: [ hosts: ["c:27017", "d:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother_replicaset.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother_replicaset.json index e3958d70adb..3da9efb0660 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother_replicaset.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother_replicaset.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -34,7 +34,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother_replicaset.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother_replicaset.yml index 19159d1efe7..c25d33ab2b0 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother_replicaset.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_rsother_replicaset.yml @@ -17,7 +17,7 @@ phases: [ hosts: ["c:27017", "d:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -28,7 +28,7 @@ phases: [ hosts: ["c:27017", "d:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary.json index 22325d4e03a..64a1ce31e31 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary.json @@ -17,7 +17,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary.yml index 184849d3ff4..83af822edad 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary.yml @@ -16,7 +16,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary_replicaset.json b/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary_replicaset.json index d903b6444d7..d230f976a2c 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary_replicaset.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary_replicaset.json @@ -17,7 +17,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary_replicaset.yml b/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary_replicaset.yml index c73a535f691..71229387ccd 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary_replicaset.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discover_secondary_replicaset.yml @@ -16,7 +16,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discovery.json b/specifications/server-discovery-and-monitoring/tests/rs/discovery.json index 50e1269223a..e9deaa7587f 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discovery.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/discovery.json @@ -18,7 +18,7 @@ "c:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -59,7 +59,7 @@ "d:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -103,7 +103,7 @@ "e:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -147,7 +147,7 @@ "c:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/discovery.yml b/specifications/server-discovery-and-monitoring/tests/rs/discovery.yml index 30c82e0cef9..19be04897bf 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/discovery.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/discovery.yml @@ -17,7 +17,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017", "c:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -63,7 +63,7 @@ phases: [ primary: "d:27017", hosts: ["b:27017", "c:27017", "d:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -113,7 +113,7 @@ phases: [ setName: "rs", hosts: ["b:27017", "c:27017", "d:27017", "e:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -165,7 +165,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017", "c:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/equal_electionids.json b/specifications/server-discovery-and-monitoring/tests/rs/equal_electionids.json index 17df3207fa8..f1deedf9f42 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/equal_electionids.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/equal_electionids.json @@ -20,7 +20,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -39,7 +39,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/equal_electionids.yml b/specifications/server-discovery-and-monitoring/tests/rs/equal_electionids.yml index 48bb683d64e..17e8aa2c11e 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/equal_electionids.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/equal_electionids.yml @@ -16,7 +16,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { ok: 1, @@ -27,7 +27,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.json b/specifications/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.json index 4e02304c619..085e81e2663 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.json @@ -15,7 +15,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.yml b/specifications/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.yml index e97fbca05bb..2ecd27ec7c0 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/hosts_differ_from_seeds.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_arbiter.json b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_arbiter.json index f0539cb3373..bda18d9f6f7 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_arbiter.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_arbiter.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_arbiter.yml b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_arbiter.yml index e4928f191d4..2e46ff29514 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_arbiter.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_arbiter.yml @@ -12,7 +12,7 @@ phases: setName: "rs" hosts: ["a:27017", "b:27017"] minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 - - "b:27017" - ok: 1 diff --git a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_ghost.json b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_ghost.json index 824e953f906..9d82e316822 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_ghost.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_ghost.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_ghost.yml b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_ghost.yml index da1db790fe4..c99badf4a39 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_ghost.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_ghost.yml @@ -12,7 +12,7 @@ phases: setName: "rs" hosts: ["a:27017", "b:27017"] minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 - - "b:27017" - ok: 1 diff --git a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_other.json b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_other.json index 6f301ef5de3..149ba01142a 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_other.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_other.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_other.yml b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_other.yml index 98061c0a1fb..16452e7b02e 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/incompatible_other.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/incompatible_other.yml @@ -12,7 +12,7 @@ phases: setName: "rs" hosts: ["a:27017", "b:27017"] minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 - - "b:27017" - ok: 1 diff --git a/specifications/server-discovery-and-monitoring/tests/rs/ls_timeout.json b/specifications/server-discovery-and-monitoring/tests/rs/ls_timeout.json index 96389d3b769..c68790ddfda 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/ls_timeout.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/ls_timeout.json @@ -20,7 +20,7 @@ "setName": "rs", "logicalSessionTimeoutMinutes": 3, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -58,7 +58,7 @@ "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -104,7 +104,7 @@ "setName": "rs", "arbiterOnly": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -152,7 +152,7 @@ "setName": "rs", "logicalSessionTimeoutMinutes": 2, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -194,7 +194,7 @@ "hidden": true, "logicalSessionTimeoutMinutes": 1, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -244,7 +244,7 @@ "setName": "rs", "logicalSessionTimeoutMinutes": null, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/ls_timeout.yml b/specifications/server-discovery-and-monitoring/tests/rs/ls_timeout.yml index 26679f339ed..2cea00e99eb 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/ls_timeout.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/ls_timeout.yml @@ -14,7 +14,7 @@ phases: [ setName: "rs", logicalSessionTimeoutMinutes: 3, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], outcome: { @@ -51,7 +51,7 @@ phases: [ isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], outcome: { @@ -90,7 +90,7 @@ phases: [ setName: "rs", arbiterOnly: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { @@ -131,7 +131,7 @@ phases: [ setName: "rs", logicalSessionTimeoutMinutes: 2, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], outcome: { @@ -172,7 +172,7 @@ phases: [ hidden: true, logicalSessionTimeoutMinutes: 1, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], outcome: { @@ -214,7 +214,7 @@ phases: [ setName: "rs", logicalSessionTimeoutMinutes: null, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/member_reconfig.json b/specifications/server-discovery-and-monitoring/tests/rs/member_reconfig.json index 0e2c2c462ea..a05fed0efb3 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/member_reconfig.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/member_reconfig.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -49,7 +49,7 @@ "a:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/member_reconfig.yml b/specifications/server-discovery-and-monitoring/tests/rs/member_reconfig.yml index 37e63bc0597..a43a88d53fc 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/member_reconfig.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/member_reconfig.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -52,7 +52,7 @@ phases: [ setName: "rs", hosts: ["a:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/member_standalone.json b/specifications/server-discovery-and-monitoring/tests/rs/member_standalone.json index 0756003a89f..db100db9f37 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/member_standalone.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/member_standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -40,7 +40,7 @@ "a:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/member_standalone.yml b/specifications/server-discovery-and-monitoring/tests/rs/member_standalone.yml index 50c0056650f..1be000ea4ee 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/member_standalone.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/member_standalone.yml @@ -13,7 +13,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -44,7 +44,7 @@ phases: [ setName: "rs", hosts: ["a:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/new_primary.json b/specifications/server-discovery-and-monitoring/tests/rs/new_primary.json index ed1a6245f96..1a84c69c919 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/new_primary.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/new_primary.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -50,7 +50,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/new_primary.yml b/specifications/server-discovery-and-monitoring/tests/rs/new_primary.yml index 736dd06c5f3..f2485a18633 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/new_primary.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/new_primary.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -52,7 +52,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.json b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.json index ccb3a41f757..509720d445a 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.json @@ -20,7 +20,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -67,7 +67,7 @@ "$oid": "000000000000000000000002" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -114,7 +114,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.yml b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.yml index dfebbd8561f..5641cfda954 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_electionid.yml @@ -16,7 +16,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -54,7 +54,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000002"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -92,7 +92,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_setversion.json b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_setversion.json index 415a0f66aa9..96533c61ee2 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_setversion.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_setversion.json @@ -20,7 +20,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -67,7 +67,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -114,7 +114,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_setversion.yml b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_setversion.yml index 3ebc798b61e..f2697971125 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_setversion.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_new_setversion.yml @@ -16,7 +16,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -54,7 +54,7 @@ phases: [ setVersion: 2, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -92,7 +92,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.json b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.json index d7b19cfe8f1..774b3a57364 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.json @@ -16,7 +16,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -49,7 +49,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.yml b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.yml index ca6303cda97..dc6df9cd8b4 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/new_primary_wrong_set_name.yml @@ -16,7 +16,7 @@ phases: [ hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -55,7 +55,7 @@ phases: [ hosts: ["a:27017"], setName: "wrong", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/non_rs_member.json b/specifications/server-discovery-and-monitoring/tests/rs/non_rs_member.json index 538077ef099..6bf10bd628f 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/non_rs_member.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/non_rs_member.json @@ -10,7 +10,7 @@ "ok": 1, "helloOk": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/non_rs_member.yml b/specifications/server-discovery-and-monitoring/tests/rs/non_rs_member.yml index c18b27ee3fa..4e2f0b1be26 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/non_rs_member.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/non_rs_member.yml @@ -11,7 +11,7 @@ phases: [ ok: 1, helloOk: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/normalize_case.json b/specifications/server-discovery-and-monitoring/tests/rs/normalize_case.json index 96a944f0c35..62915495e0c 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/normalize_case.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/normalize_case.json @@ -21,7 +21,7 @@ "C:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/normalize_case.yml b/specifications/server-discovery-and-monitoring/tests/rs/normalize_case.yml index d8003ee3754..a543ab72af1 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/normalize_case.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/normalize_case.yml @@ -17,7 +17,7 @@ phases: [ passives: ["B:27017"], arbiters: ["C:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/normalize_case_me.json b/specifications/server-discovery-and-monitoring/tests/rs/normalize_case_me.json index ab1720cefc0..0d9ba6213e2 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/normalize_case_me.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/normalize_case_me.json @@ -22,7 +22,7 @@ "C:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -67,7 +67,7 @@ "C:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/normalize_case_me.yml b/specifications/server-discovery-and-monitoring/tests/rs/normalize_case_me.yml index a0df3351a51..03ac43f314e 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/normalize_case_me.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/normalize_case_me.yml @@ -18,7 +18,7 @@ phases: [ passives: ["B:27017"], arbiters: ["C:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -66,7 +66,7 @@ phases: [ passives: ["B:27017"], arbiters: ["C:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.json b/specifications/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.json index f1fa2e252e1..9e7ccc6e7f2 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.json @@ -18,7 +18,7 @@ "setVersion": 1, "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 7 } ] ], @@ -66,7 +66,7 @@ "$oid": "000000000000000000000002" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -116,7 +116,7 @@ "setVersion": 1, "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 7 } ] ], @@ -167,7 +167,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 7 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.yml b/specifications/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.yml index 7e9bd55021a..63f9699f228 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/null_election_id-pre-6.0.yml @@ -15,7 +15,7 @@ phases: [ setVersion: 1, setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], @@ -57,7 +57,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000002"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], @@ -99,7 +99,7 @@ phases: [ setVersion: 1, setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], outcome: { @@ -142,7 +142,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], outcome: { diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_ghost.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_ghost.json index 9c54b39856e..e34280e88c1 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_ghost.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_ghost.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -41,7 +41,7 @@ "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_ghost.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_ghost.yml index dbf5b9289d9..ee0158db0d0 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_ghost.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_ghost.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["a:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -43,7 +43,7 @@ phases: [ isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_mongos.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_mongos.json index ac416e57d5f..79510d9399b 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_mongos.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_mongos.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -41,7 +41,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_mongos.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_mongos.yml index 6cdb0771068..251f1552776 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_mongos.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_mongos.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["a:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -43,7 +43,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_standalone.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_standalone.json index a64524d0ca4..abcc1e2d012 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_standalone.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_standalone.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -38,7 +38,7 @@ { "ok": 1, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_standalone.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_standalone.yml index abcc7fcfe3e..9f6a0817bf7 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_standalone.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_becomes_standalone.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["a:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -40,7 +40,7 @@ phases: [ ["a:27017", { ok: 1, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_changes_set_name.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_changes_set_name.json index bf70ca3014b..3b564d2c931 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_changes_set_name.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_changes_set_name.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -44,7 +44,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_changes_set_name.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_changes_set_name.yml index 00ed1c0a13e..e49aa249116 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_changes_set_name.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_changes_set_name.yml @@ -16,7 +16,7 @@ phases: [ hosts: ["a:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -48,7 +48,7 @@ phases: [ hosts: ["a:27017"], setName: "wrong", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect.json index 3db854f0859..73a01a82a9f 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect.yml index 9a49656549a..84c88daa671 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["a:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_electionid.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_electionid.json index 3a80b150fe3..5a91188ea8d 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_electionid.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_electionid.json @@ -20,7 +20,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -39,7 +39,7 @@ "$oid": "000000000000000000000002" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -115,7 +115,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -159,7 +159,7 @@ "$oid": "000000000000000000000003" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -203,7 +203,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_electionid.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_electionid.yml index 0d7d294f974..391ec31213f 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_electionid.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_electionid.yml @@ -16,7 +16,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { ok: 1, @@ -27,7 +27,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000002"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -91,7 +91,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { @@ -127,7 +127,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000003"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { @@ -163,7 +163,7 @@ phases: [ hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_setversion.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_setversion.json index 32e03fb7d4b..f7417ad77bc 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_setversion.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_setversion.json @@ -20,7 +20,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -39,7 +39,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -115,7 +115,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -159,7 +159,7 @@ "$oid": "000000000000000000000002" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -203,7 +203,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_setversion.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_setversion.yml index 41f2f8d7b73..57eeb573e48 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_setversion.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_disconnect_setversion.yml @@ -16,7 +16,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { ok: 1, @@ -27,7 +27,7 @@ phases: [ setVersion: 2, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -91,7 +91,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { @@ -127,7 +127,7 @@ phases: [ setVersion: 2, electionId: {"$oid": "000000000000000000000002"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { @@ -163,7 +163,7 @@ phases: [ hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_hint_from_secondary_with_mismatched_me.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_hint_from_secondary_with_mismatched_me.json index bc02cc95712..1ca72225a29 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_hint_from_secondary_with_mismatched_me.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_hint_from_secondary_with_mismatched_me.json @@ -18,7 +18,7 @@ "setName": "rs", "primary": "b:27017", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -48,7 +48,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_hint_from_secondary_with_mismatched_me.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_hint_from_secondary_with_mismatched_me.yml index f5b536c01f4..cebbe7d0833 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_hint_from_secondary_with_mismatched_me.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_hint_from_secondary_with_mismatched_me.yml @@ -17,7 +17,7 @@ phases: [ setName: "rs", primary: "b:27017", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -45,7 +45,7 @@ phases: [ hosts: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_mismatched_me.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_mismatched_me.json index 2d2c0f40d8d..6bb6226f8a7 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_mismatched_me.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_mismatched_me.json @@ -31,7 +31,7 @@ "ok": 1, "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ] diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_mismatched_me.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_mismatched_me.yml index c24fd1a990e..25ca1722e0e 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_mismatched_me.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_mismatched_me.yml @@ -22,6 +22,6 @@ phases: ok: 1 setName: rs minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 uri: 'mongodb://localhost:27017/?replicaSet=rs' diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_reports_new_member.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_reports_new_member.json index ac0d9374f0d..ed28c48c871 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_reports_new_member.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_reports_new_member.json @@ -17,7 +17,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -51,7 +51,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -86,7 +86,7 @@ "c:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -127,7 +127,7 @@ "c:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_reports_new_member.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_reports_new_member.yml index de3f528fe9e..aa2878d6374 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_reports_new_member.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_reports_new_member.yml @@ -17,7 +17,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -55,7 +55,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -93,7 +93,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017", "c:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -140,7 +140,7 @@ phases: [ primary: "b:27017", hosts: ["a:27017", "b:27017", "c:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_to_no_primary_mismatched_me.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_to_no_primary_mismatched_me.json index 6dbd73dadc1..798a648d196 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_to_no_primary_mismatched_me.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_to_no_primary_mismatched_me.json @@ -17,7 +17,7 @@ "me": "a:27017", "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -52,7 +52,7 @@ "me": "c:27017", "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_to_no_primary_mismatched_me.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_to_no_primary_mismatched_me.yml index a78982c28e1..e8bdb00f0ff 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_to_no_primary_mismatched_me.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_to_no_primary_mismatched_me.yml @@ -16,7 +16,7 @@ phases: [ me: "a:27017", setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -53,7 +53,7 @@ phases: [ me : "c:27017", setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_wrong_set_name.json b/specifications/server-discovery-and-monitoring/tests/rs/primary_wrong_set_name.json index cc0691fb8c7..1366e389969 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_wrong_set_name.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_wrong_set_name.json @@ -15,7 +15,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/primary_wrong_set_name.yml b/specifications/server-discovery-and-monitoring/tests/rs/primary_wrong_set_name.yml index d4434522a98..3e463333e6d 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/primary_wrong_set_name.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/primary_wrong_set_name.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["a:27017"], setName: "wrong", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/repeated.json b/specifications/server-discovery-and-monitoring/tests/rs/repeated.json index 610aeae0ac7..3ce0948ab82 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/repeated.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/repeated.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -49,7 +49,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -84,7 +84,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -120,7 +120,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/repeated.yml b/specifications/server-discovery-and-monitoring/tests/rs/repeated.yml index f651005babe..b9e14ed9828 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/repeated.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/repeated.yml @@ -15,7 +15,7 @@ phases: hosts: ["a:27017", "c:27017"] setName: "rs" minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: servers: "a:27017": @@ -39,7 +39,7 @@ phases: helloOk: true isWritablePrimary: true minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: servers: "a:27017": @@ -64,7 +64,7 @@ phases: hosts: ["a:27017", "c:27017"] setName: "rs" minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: servers: "a:27017": @@ -90,7 +90,7 @@ phases: hosts: ["a:27017", "c:27017"] setName: "rs" minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: servers: "a:27017": diff --git a/specifications/server-discovery-and-monitoring/tests/rs/replicaset_rsnp.json b/specifications/server-discovery-and-monitoring/tests/rs/replicaset_rsnp.json index 3148e1c141f..1cd732b82f1 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/replicaset_rsnp.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/replicaset_rsnp.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/replicaset_rsnp.yml b/specifications/server-discovery-and-monitoring/tests/rs/replicaset_rsnp.yml index 87e80bdb319..6bdf8cbe2d8 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/replicaset_rsnp.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/replicaset_rsnp.yml @@ -11,7 +11,7 @@ phases: helloOk: true isWritablePrimary: true minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: # Server is removed because it's a standalone and the driver # started in RSNP topology diff --git a/specifications/server-discovery-and-monitoring/tests/rs/response_from_removed.json b/specifications/server-discovery-and-monitoring/tests/rs/response_from_removed.json index 87a66d9e728..fa46a14ceb3 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/response_from_removed.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/response_from_removed.json @@ -15,7 +15,7 @@ "a:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -46,7 +46,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/response_from_removed.yml b/specifications/server-discovery-and-monitoring/tests/rs/response_from_removed.yml index 6ec66c87501..fc9961ce364 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/response_from_removed.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/response_from_removed.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["a:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -47,7 +47,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/sec_not_auth.json b/specifications/server-discovery-and-monitoring/tests/rs/sec_not_auth.json index a39855e654a..ccbe7a08af9 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/sec_not_auth.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/sec_not_auth.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -32,7 +32,7 @@ "c:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/sec_not_auth.yml b/specifications/server-discovery-and-monitoring/tests/rs/sec_not_auth.yml index 09c75f9c78c..507eb9d2927 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/sec_not_auth.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/sec_not_auth.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -27,7 +27,7 @@ phases: [ setName: "rs", hosts: ["b:27017", "c:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0-pre-6.0.json b/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0-pre-6.0.json index 054425c84c0..f27060533cd 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0-pre-6.0.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0-pre-6.0.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -32,7 +32,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -59,7 +59,7 @@ { "ok": 0, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0-pre-6.0.yml b/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0-pre-6.0.yml index de9048d4012..b63c43f2277 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0-pre-6.0.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0-pre-6.0.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -26,7 +26,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -59,7 +59,7 @@ phases: [ ok: 0, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0.json b/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0.json index ee9519930b4..9ffff58ef05 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -32,7 +32,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -59,7 +59,7 @@ { "ok": 0, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0.yml b/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0.yml index d94fafaf992..796e7f668e1 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_ignore_ok_0.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -26,7 +26,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -59,7 +59,7 @@ phases: [ ok: 0, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_mismatched_me.json b/specifications/server-discovery-and-monitoring/tests/rs/secondary_mismatched_me.json index 6f1b9b59866..790e4bfca84 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_mismatched_me.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_mismatched_me.json @@ -32,7 +32,7 @@ "ok": 1, "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ] diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_mismatched_me.yml b/specifications/server-discovery-and-monitoring/tests/rs/secondary_mismatched_me.yml index e5f0f9aceb6..d359609d838 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_mismatched_me.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_mismatched_me.yml @@ -25,4 +25,4 @@ phases: ok: 1 setName: rs minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name.json b/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name.json index 8d2f152f594..1f86b505437 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name.json @@ -16,7 +16,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name.yml b/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name.yml index 0121d631ce4..60823815f00 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name.yml @@ -16,7 +16,7 @@ phases: [ hosts: ["a:27017"], setName: "wrong", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name_with_primary.json b/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name_with_primary.json index b7ef2d6d6ab..6b899141514 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name_with_primary.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name_with_primary.json @@ -16,7 +16,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -51,7 +51,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name_with_primary.yml b/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name_with_primary.yml index acd471e78ba..8d1990363cb 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name_with_primary.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/secondary_wrong_set_name_with_primary.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -53,7 +53,7 @@ phases: [ hosts: ["a:27017", "b:27017"], setName: "wrong", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.json b/specifications/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.json index c2e2fe5b9ba..e62c6963ed3 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.json @@ -17,7 +17,7 @@ "setName": "rs", "setVersion": 2, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 7 } ] ], @@ -56,7 +56,7 @@ "setName": "rs", "setVersion": 1, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 7 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.yml b/specifications/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.yml index 54bfa4d2563..0fe6819aa71 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/setversion_without_electionid-pre-6.0.yml @@ -15,7 +15,7 @@ phases: [ setName: "rs", setVersion: 2, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], @@ -52,7 +52,7 @@ phases: [ setName: "rs", setVersion: 1, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/stepdown_change_set_name.json b/specifications/server-discovery-and-monitoring/tests/rs/stepdown_change_set_name.json index e9075f97f22..6de995518d3 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/stepdown_change_set_name.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/stepdown_change_set_name.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -45,7 +45,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/stepdown_change_set_name.yml b/specifications/server-discovery-and-monitoring/tests/rs/stepdown_change_set_name.yml index 9c4140925d5..2e1c1a551e7 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/stepdown_change_set_name.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/stepdown_change_set_name.yml @@ -16,7 +16,7 @@ phases: [ hosts: ["a:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -50,7 +50,7 @@ phases: [ hosts: ["a:27017"], setName: "wrong", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/too_new.json b/specifications/server-discovery-and-monitoring/tests/rs/too_new.json index 0433d27a368..696246f8e10 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/too_new.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/too_new.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/specifications/server-discovery-and-monitoring/tests/rs/too_new.yml b/specifications/server-discovery-and-monitoring/tests/rs/too_new.yml index 52912826beb..121286554ed 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/too_new.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/too_new.yml @@ -12,7 +12,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { ok: 1, diff --git a/specifications/server-discovery-and-monitoring/tests/rs/too_old.json b/specifications/server-discovery-and-monitoring/tests/rs/too_old.json index 461d00acc4c..dc8a5b2b9c4 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/too_old.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/too_old.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -30,7 +30,9 @@ "hosts": [ "a:27017", "b:27017" - ] + ], + "minWireVersion": 999, + "maxWireVersion": 1000 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/too_old.yml b/specifications/server-discovery-and-monitoring/tests/rs/too_old.yml index ab238dbab9b..f4d4bd8b55a 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/too_old.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/too_old.yml @@ -10,7 +10,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { ok: 1, @@ -18,7 +18,9 @@ phases: [ isWritablePrimary: false, secondary: true, setName: "rs", - hosts: ["a:27017", "b:27017"] + hosts: ["a:27017", "b:27017"], + minWireVersion: 999, + maxWireVersion: 1000 }] ], outcome: { diff --git a/specifications/server-discovery-and-monitoring/tests/rs/unexpected_mongos.json b/specifications/server-discovery-and-monitoring/tests/rs/unexpected_mongos.json index cc19a961f2c..c6ffb321cae 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/unexpected_mongos.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/unexpected_mongos.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/unexpected_mongos.yml b/specifications/server-discovery-and-monitoring/tests/rs/unexpected_mongos.yml index d0d8547f960..a9c5a24ee63 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/unexpected_mongos.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/unexpected_mongos.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.json b/specifications/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.json index 5c58b656145..2f9b567b850 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.json @@ -20,7 +20,7 @@ "$oid": "000000000000000000000001" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 7 } ] ], @@ -64,7 +64,7 @@ "setName": "rs", "setVersion": 2, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 7 } ] ], @@ -108,7 +108,7 @@ "$oid": "000000000000000000000002" }, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 7 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.yml b/specifications/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.yml index a0434eb45c0..24d6accbe0a 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/use_setversion_without_electionid-pre-6.0.yml @@ -16,7 +16,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000001"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], @@ -53,7 +53,7 @@ phases: [ setName: "rs", setVersion: 2, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], @@ -91,7 +91,7 @@ phases: [ setVersion: 1, electionId: {"$oid": "000000000000000000000002"}, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 7 }] ], outcome: { diff --git a/specifications/server-discovery-and-monitoring/tests/rs/wrong_set_name.json b/specifications/server-discovery-and-monitoring/tests/rs/wrong_set_name.json index 9654ff7b79b..d0764d24dc3 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/wrong_set_name.json +++ b/specifications/server-discovery-and-monitoring/tests/rs/wrong_set_name.json @@ -17,7 +17,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/rs/wrong_set_name.yml b/specifications/server-discovery-and-monitoring/tests/rs/wrong_set_name.yml index ae75d6f7e44..e7d3ace92dc 100644 --- a/specifications/server-discovery-and-monitoring/tests/rs/wrong_set_name.yml +++ b/specifications/server-discovery-and-monitoring/tests/rs/wrong_set_name.yml @@ -16,7 +16,7 @@ phases: [ hosts: ["b:27017", "c:27017"], setName: "wrong", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/discover_single_mongos.json b/specifications/server-discovery-and-monitoring/tests/sharded/discover_single_mongos.json index 9e877a0840d..bf7e57521c0 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/discover_single_mongos.json +++ b/specifications/server-discovery-and-monitoring/tests/sharded/discover_single_mongos.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/discover_single_mongos.yml b/specifications/server-discovery-and-monitoring/tests/sharded/discover_single_mongos.yml index f44a2970dd2..1e8adc6c5c0 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/discover_single_mongos.yml +++ b/specifications/server-discovery-and-monitoring/tests/sharded/discover_single_mongos.yml @@ -13,7 +13,7 @@ phases: isWritablePrimary: true msg: "isdbgrid" minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: servers: diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/ls_timeout_mongos.json b/specifications/server-discovery-and-monitoring/tests/sharded/ls_timeout_mongos.json index 93fa398d52e..3da0f84ca23 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/ls_timeout_mongos.json +++ b/specifications/server-discovery-and-monitoring/tests/sharded/ls_timeout_mongos.json @@ -13,7 +13,7 @@ "msg": "isdbgrid", "logicalSessionTimeoutMinutes": 1, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -25,7 +25,7 @@ "msg": "isdbgrid", "logicalSessionTimeoutMinutes": 2, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -56,7 +56,7 @@ "msg": "isdbgrid", "logicalSessionTimeoutMinutes": 1, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -67,7 +67,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/ls_timeout_mongos.yml b/specifications/server-discovery-and-monitoring/tests/sharded/ls_timeout_mongos.yml index 7f78d0d6c6f..62ae97f0571 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/ls_timeout_mongos.yml +++ b/specifications/server-discovery-and-monitoring/tests/sharded/ls_timeout_mongos.yml @@ -15,7 +15,7 @@ phases: [ msg: "isdbgrid", logicalSessionTimeoutMinutes: 1, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -26,7 +26,7 @@ phases: [ msg: "isdbgrid", logicalSessionTimeoutMinutes: 2, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -63,7 +63,7 @@ phases: [ msg: "isdbgrid", logicalSessionTimeoutMinutes: 1, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -73,7 +73,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/mongos_disconnect.json b/specifications/server-discovery-and-monitoring/tests/sharded/mongos_disconnect.json index 50a93eda5ff..29b33518695 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/mongos_disconnect.json +++ b/specifications/server-discovery-and-monitoring/tests/sharded/mongos_disconnect.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -23,7 +23,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -76,7 +76,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/mongos_disconnect.yml b/specifications/server-discovery-and-monitoring/tests/sharded/mongos_disconnect.yml index c4393d85b10..c384b3be115 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/mongos_disconnect.yml +++ b/specifications/server-discovery-and-monitoring/tests/sharded/mongos_disconnect.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -24,7 +24,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], @@ -85,7 +85,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/multiple_mongoses.json b/specifications/server-discovery-and-monitoring/tests/sharded/multiple_mongoses.json index 311592d715a..ae0c2d9cdef 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/multiple_mongoses.json +++ b/specifications/server-discovery-and-monitoring/tests/sharded/multiple_mongoses.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -23,7 +23,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/multiple_mongoses.yml b/specifications/server-discovery-and-monitoring/tests/sharded/multiple_mongoses.yml index 0a49d642499..6311605a896 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/multiple_mongoses.yml +++ b/specifications/server-discovery-and-monitoring/tests/sharded/multiple_mongoses.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -24,7 +24,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/non_mongos_removed.json b/specifications/server-discovery-and-monitoring/tests/sharded/non_mongos_removed.json index d74375ebbfd..4698f576d5a 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/non_mongos_removed.json +++ b/specifications/server-discovery-and-monitoring/tests/sharded/non_mongos_removed.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -26,7 +26,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/non_mongos_removed.yml b/specifications/server-discovery-and-monitoring/tests/sharded/non_mongos_removed.yml index ab25349bda8..aa604f11001 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/non_mongos_removed.yml +++ b/specifications/server-discovery-and-monitoring/tests/sharded/non_mongos_removed.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { @@ -25,7 +25,7 @@ phases: [ hosts: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/too_old.json b/specifications/server-discovery-and-monitoring/tests/sharded/too_old.json index 688e1db0f5a..b918715ada8 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/too_old.json +++ b/specifications/server-discovery-and-monitoring/tests/sharded/too_old.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 2, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/specifications/server-discovery-and-monitoring/tests/sharded/too_old.yml b/specifications/server-discovery-and-monitoring/tests/sharded/too_old.yml index 925a8f55b8e..a709934c2f6 100644 --- a/specifications/server-discovery-and-monitoring/tests/sharded/too_old.yml +++ b/specifications/server-discovery-and-monitoring/tests/sharded/too_old.yml @@ -9,7 +9,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 2, - maxWireVersion: 6 + maxWireVersion: 21 }], ["b:27017", { ok: 1, diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_external_ip.json b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_external_ip.json index 90676a8f9b0..1461b4c4694 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_external_ip.json +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_external_ip.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_external_ip.yml b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_external_ip.yml index 18c01226a9a..0cb73c50e2a 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_external_ip.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_external_ip.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["b:27017"], # Internal IP. setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_mongos.json b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_mongos.json index 25fe9651856..72be020862b 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_mongos.json +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_mongos.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_mongos.yml b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_mongos.yml index 853ce57c17e..e81c9aef9b5 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_mongos.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_mongos.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_replicaset.json b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_replicaset.json index cd8660888a0..82a51d390eb 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_replicaset.json +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_replicaset.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_replicaset.yml b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_replicaset.yml index 21e565fd9cb..9a0f3996ca1 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_replicaset.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_replicaset.yml @@ -12,7 +12,7 @@ phases: isWritablePrimary: true setName: rs minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: servers: "a:27017": diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsarbiter.json b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsarbiter.json index e2049560566..e06d2843645 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsarbiter.json +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsarbiter.json @@ -17,7 +17,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsarbiter.yml b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsarbiter.yml index 7e262c9dbe8..d9fa876655e 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsarbiter.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsarbiter.yml @@ -16,7 +16,7 @@ phases: [ hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsprimary.json b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsprimary.json index 409e8502b3c..45eb1602fb7 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsprimary.json +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsprimary.json @@ -16,7 +16,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsprimary.yml b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsprimary.yml index 4ea0b1551fe..85dcb30a7c5 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsprimary.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rsprimary.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rssecondary.json b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rssecondary.json index 305f283b527..b1bef8a49f4 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rssecondary.json +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rssecondary.json @@ -17,7 +17,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rssecondary.yml b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rssecondary.yml index b0c4d1f2181..2d7da65e41e 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rssecondary.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_rssecondary.yml @@ -16,7 +16,7 @@ phases: [ hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_standalone.json b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_standalone.json index b47278482a7..e71ba07e740 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_standalone.json +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_standalone.yml b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_standalone.yml index cd71087e4d6..ab4cb02ad44 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_standalone.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_standalone.yml @@ -13,7 +13,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_wrong_set_name.json b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_wrong_set_name.json index 71080e6810e..8014a0a5337 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_wrong_set_name.json +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_wrong_set_name.json @@ -16,7 +16,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], @@ -45,7 +45,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_wrong_set_name.yml b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_wrong_set_name.yml index f1e48dc4194..46b476d0498 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/direct_connection_wrong_set_name.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/direct_connection_wrong_set_name.yml @@ -11,7 +11,7 @@ phases: - b:27017 setName: wrong minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: servers: a:27017: @@ -29,7 +29,7 @@ phases: - b:27017 setName: rs minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 outcome: servers: a:27017: diff --git a/specifications/server-discovery-and-monitoring/tests/single/discover_standalone.json b/specifications/server-discovery-and-monitoring/tests/single/discover_standalone.json index 858cbdaf638..d78c81654b2 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/discover_standalone.json +++ b/specifications/server-discovery-and-monitoring/tests/single/discover_standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/discover_standalone.yml b/specifications/server-discovery-and-monitoring/tests/single/discover_standalone.yml index 49ebb142091..bc112d4eac5 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/discover_standalone.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/discover_standalone.yml @@ -13,7 +13,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/ls_timeout_standalone.json b/specifications/server-discovery-and-monitoring/tests/single/ls_timeout_standalone.json index 87b3e4e8a10..236eabe00ab 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/ls_timeout_standalone.json +++ b/specifications/server-discovery-and-monitoring/tests/single/ls_timeout_standalone.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "logicalSessionTimeoutMinutes": 7, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/ls_timeout_standalone.yml b/specifications/server-discovery-and-monitoring/tests/single/ls_timeout_standalone.yml index 2926d95a9dd..4747af6770b 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/ls_timeout_standalone.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/ls_timeout_standalone.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, logicalSessionTimeoutMinutes: 7, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/not_ok_response.json b/specifications/server-discovery-and-monitoring/tests/single/not_ok_response.json index 8e7c2a10e37..cfaac3564ac 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/not_ok_response.json +++ b/specifications/server-discovery-and-monitoring/tests/single/not_ok_response.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ @@ -21,7 +21,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/not_ok_response.yml b/specifications/server-discovery-and-monitoring/tests/single/not_ok_response.yml index 64103a59024..c1ae7d98754 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/not_ok_response.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/not_ok_response.yml @@ -13,7 +13,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ["a:27017", { @@ -22,7 +22,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/standalone_removed.json b/specifications/server-discovery-and-monitoring/tests/single/standalone_removed.json index 57f8f861b18..675cdbb0083 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/standalone_removed.json +++ b/specifications/server-discovery-and-monitoring/tests/single/standalone_removed.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/standalone_removed.yml b/specifications/server-discovery-and-monitoring/tests/single/standalone_removed.yml index 59b44b162e7..c8404463f73 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/standalone_removed.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/standalone_removed.yml @@ -13,7 +13,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/standalone_using_legacy_hello.json b/specifications/server-discovery-and-monitoring/tests/single/standalone_using_legacy_hello.json index 46660fa8de5..488cac49181 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/standalone_using_legacy_hello.json +++ b/specifications/server-discovery-and-monitoring/tests/single/standalone_using_legacy_hello.json @@ -10,7 +10,7 @@ "ok": 1, "ismaster": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/specifications/server-discovery-and-monitoring/tests/single/standalone_using_legacy_hello.yml b/specifications/server-discovery-and-monitoring/tests/single/standalone_using_legacy_hello.yml index a18ecb70fc3..82c6ccfa7b1 100644 --- a/specifications/server-discovery-and-monitoring/tests/single/standalone_using_legacy_hello.yml +++ b/specifications/server-discovery-and-monitoring/tests/single/standalone_using_legacy_hello.yml @@ -12,7 +12,7 @@ phases: [ ok: 1, ismaster: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/src/MongoDB.Driver/Core/DatabaseNamespace.cs b/src/MongoDB.Driver/Core/DatabaseNamespace.cs index 2fa91d4065e..360a527065b 100644 --- a/src/MongoDB.Driver/Core/DatabaseNamespace.cs +++ b/src/MongoDB.Driver/Core/DatabaseNamespace.cs @@ -86,11 +86,13 @@ public string DatabaseName get { return _databaseName; } } + [Obsolete("This collection namespace was removed in server version 4.2. As such, this property will be removed in a later release.")] internal CollectionNamespace SystemIndexesCollection { get { return new CollectionNamespace(this, "system.indexes"); } } + [Obsolete("This collection namespace was removed in server version 4.2. As such, this property will be removed in a later release.")] internal CollectionNamespace SystemNamespacesCollection { get { return new CollectionNamespace(this, "system.namespaces"); } diff --git a/src/MongoDB.Driver/Core/Misc/Feature.cs b/src/MongoDB.Driver/Core/Misc/Feature.cs index 762b7d0591e..fecba2788f6 100644 --- a/src/MongoDB.Driver/Core/Misc/Feature.cs +++ b/src/MongoDB.Driver/Core/Misc/Feature.cs @@ -215,6 +215,7 @@ public class Feature /// /// Gets the create indexes using insert operations feature. /// + [Obsolete("This feature was removed in server version 4.2. As such, this property will be removed in a later release.")] public static Feature CreateIndexesUsingInsertOperations => __createIndexesUsingInsertOperations; /// @@ -275,6 +276,7 @@ public class Feature /// /// Gets the eval feature. /// + [Obsolete("This feature was removed in server version 4.2. As such, this property will be removed in a later release.")] public static Feature Eval => __eval; /// @@ -328,6 +330,7 @@ public class Feature /// /// Gets the group command feature. /// + [Obsolete("This feature was removed in server version 4.2. As such, this property will be removed in a later release.")] public static Feature GroupCommand => __groupCommand; /// @@ -395,6 +398,7 @@ public class Feature /// /// Gets the mmapv1 storage engine feature. /// + [Obsolete("This feature was removed in server version 4.2. As such, this property will be removed in a later release.")] public static Feature MmapV1StorageEngine => __mmapV1StorageEngine; /// diff --git a/src/MongoDB.Driver/Core/Misc/WireVersion.cs b/src/MongoDB.Driver/Core/Misc/WireVersion.cs index bacf5406e74..fe5f9f36a83 100644 --- a/src/MongoDB.Driver/Core/Misc/WireVersion.cs +++ b/src/MongoDB.Driver/Core/Misc/WireVersion.cs @@ -169,7 +169,7 @@ internal static class WireVersion new WireVersionInfo(wireVersion: 27, major: 8, minor: 2), }; - private static Range __supportedWireVersionRange = CreateSupportedWireVersionRange(minWireVersion: Server40, maxWireVersion: Server82); + private static Range __supportedWireVersionRange = CreateSupportedWireVersionRange(minWireVersion: Server42, maxWireVersion: Server82); private static Range CreateSupportedWireVersionRange(int minWireVersion, int maxWireVersion) { diff --git a/src/MongoDB.Driver/Core/Operations/CreateCollectionOperation.cs b/src/MongoDB.Driver/Core/Operations/CreateCollectionOperation.cs index 31b2f7be994..c6e72696e37 100644 --- a/src/MongoDB.Driver/Core/Operations/CreateCollectionOperation.cs +++ b/src/MongoDB.Driver/Core/Operations/CreateCollectionOperation.cs @@ -79,10 +79,8 @@ CreateCollectionOperation CreateInnerCollectionOperation(string collectionName) private long? _maxDocuments; private long? _maxSize; private readonly MessageEncoderSettings _messageEncoderSettings; - private bool? _noPadding; private BsonDocument _storageEngine; private TimeSeriesOptions _timeSeriesOptions; - private bool? _usePowerOf2Sizes; private DocumentValidationAction? _validationAction; private DocumentValidationLevel? _validationLevel; private BsonDocument _validator; @@ -171,12 +169,6 @@ public MessageEncoderSettings MessageEncoderSettings get { return _messageEncoderSettings; } } - public bool? NoPadding - { - get { return _noPadding; } - set { _noPadding = value; } - } - public BsonDocument StorageEngine { get { return _storageEngine; } @@ -189,12 +181,6 @@ public TimeSeriesOptions TimeSeriesOptions set { _timeSeriesOptions = value; } } - public bool? UsePowerOf2Sizes - { - get { return _usePowerOf2Sizes; } - set { _usePowerOf2Sizes = value; } - } - public DocumentValidationAction? ValidationAction { get { return _validationAction; } @@ -227,7 +213,6 @@ public BsonDocument ClusteredIndex internal BsonDocument CreateCommand(ICoreSessionHandle session) { - var flags = GetFlags(); var writeConcern = WriteConcernHelper.GetEffectiveWriteConcern(session, _writeConcern); return new BsonDocument { @@ -236,7 +221,6 @@ internal BsonDocument CreateCommand(ICoreSessionHandle session) { "capped", () => _capped.Value, _capped.HasValue }, { "size", () => _maxSize.Value, _maxSize.HasValue }, { "max", () => _maxDocuments.Value, _maxDocuments.HasValue }, - { "flags", () => (int)flags.Value, flags.HasValue }, { "storageEngine", _storageEngine, _storageEngine != null }, { "indexOptionDefaults", _indexOptionDefaults, _indexOptionDefaults != null }, { "validator", _validator, _validator != null }, @@ -252,27 +236,6 @@ internal BsonDocument CreateCommand(ICoreSessionHandle session) }; } - private CreateCollectionFlags? GetFlags() - { - if (_usePowerOf2Sizes.HasValue || _noPadding.HasValue) - { - var flags = CreateCollectionFlags.None; - if (_usePowerOf2Sizes.HasValue && _usePowerOf2Sizes.Value) - { - flags |= CreateCollectionFlags.UsePowerOf2Sizes; - } - if (_noPadding.HasValue && _noPadding.Value) - { - flags |= CreateCollectionFlags.NoPadding; - } - return flags; - } - else - { - return null; - } - } - public BsonDocument Execute(OperationContext operationContext, IWriteBinding binding) { Ensure.IsNotNull(binding, nameof(binding)); @@ -319,13 +282,5 @@ private void EnsureServerIsValid(int maxWireVersion) { _supportedFeature?.ThrowIfNotSupported(maxWireVersion); } - - [Flags] - private enum CreateCollectionFlags - { - None = 0, - UsePowerOf2Sizes = 1, - NoPadding = 2 - } } } diff --git a/src/MongoDB.Driver/Core/Operations/EvalOperation.cs b/src/MongoDB.Driver/Core/Operations/EvalOperation.cs deleted file mode 100644 index b8bb23cfce5..00000000000 --- a/src/MongoDB.Driver/Core/Operations/EvalOperation.cs +++ /dev/null @@ -1,112 +0,0 @@ -/* Copyright 2013-present 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. -*/ - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Driver.Core.Bindings; -using MongoDB.Driver.Core.Misc; -using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; - -namespace MongoDB.Driver.Core.Operations -{ - internal sealed class EvalOperation : IWriteOperation - { - private IEnumerable _args; - private readonly DatabaseNamespace _databaseNamespace; - private readonly BsonJavaScript _function; - private TimeSpan? _maxTime; - private readonly MessageEncoderSettings _messageEncoderSettings; - private bool? _noLock; - - public EvalOperation( - DatabaseNamespace databaseNamespace, - BsonJavaScript function, - MessageEncoderSettings messageEncoderSettings) - { - _databaseNamespace = Ensure.IsNotNull(databaseNamespace, nameof(databaseNamespace)); - _function = Ensure.IsNotNull(function, nameof(function)); - _messageEncoderSettings = messageEncoderSettings; - } - - public IEnumerable Args - { - get { return _args; } - set { _args = value; } - } - - public DatabaseNamespace DatabaseNamespace - { - get { return _databaseNamespace; } - } - - public BsonJavaScript Function - { - get { return _function; } - } - - public TimeSpan? MaxTime - { - get { return _maxTime; } - set { _maxTime = Ensure.IsNullOrInfiniteOrGreaterThanOrEqualToZero(value, nameof(value)); } - } - - public MessageEncoderSettings MessageEncoderSettings - { - get { return _messageEncoderSettings; } - } - - public bool? NoLock - { - get { return _noLock; } - set { _noLock = value; } - } - - public BsonDocument CreateCommand() - { - return new BsonDocument - { - { "$eval", _function }, - { "args", () => new BsonArray(_args), _args != null }, - { "nolock", () => _noLock.Value, _noLock.HasValue }, - { "maxTimeMS", () => MaxTimeHelper.ToMaxTimeMS(_maxTime.Value), _maxTime.HasValue } - }; - } - - public BsonValue Execute(OperationContext operationContext, IWriteBinding binding) - { - Ensure.IsNotNull(binding, nameof(binding)); - var operation = CreateOperation(); - var result = operation.Execute(operationContext, binding); - return result["retval"]; - } - - public async Task ExecuteAsync(OperationContext operationContext, IWriteBinding binding) - { - Ensure.IsNotNull(binding, nameof(binding)); - var operation = CreateOperation(); - var result = await operation.ExecuteAsync(operationContext, binding).ConfigureAwait(false); - return result["retval"]; - } - - private WriteCommandOperation CreateOperation() - { - var command = CreateCommand(); - return new WriteCommandOperation(_databaseNamespace, command, BsonDocumentSerializer.Instance, _messageEncoderSettings); - } - } -} diff --git a/src/MongoDB.Driver/Core/Operations/GroupOperation.cs b/src/MongoDB.Driver/Core/Operations/GroupOperation.cs deleted file mode 100644 index 4c987e09300..00000000000 --- a/src/MongoDB.Driver/Core/Operations/GroupOperation.cs +++ /dev/null @@ -1,177 +0,0 @@ -/* Copyright 2013-present 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. -*/ - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using MongoDB.Bson; -using MongoDB.Bson.Serialization; -using MongoDB.Bson.Serialization.Serializers; -using MongoDB.Driver.Core.Bindings; -using MongoDB.Driver.Core.Misc; -using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; - -namespace MongoDB.Driver.Core.Operations -{ - internal sealed class GroupOperation : IReadOperation> - { - private Collation _collation; - private readonly CollectionNamespace _collectionNamespace; - private readonly BsonDocument _filter; - private BsonJavaScript _finalizeFunction; - private readonly BsonDocument _initial; - private readonly BsonDocument _key; - private readonly BsonJavaScript _keyFunction; - private TimeSpan? _maxTime; - private readonly MessageEncoderSettings _messageEncoderSettings; - private readonly BsonJavaScript _reduceFunction; - private IBsonSerializer _resultSerializer; - - public GroupOperation(CollectionNamespace collectionNamespace, BsonDocument key, BsonDocument initial, BsonJavaScript reduceFunction, BsonDocument filter, MessageEncoderSettings messageEncoderSettings) - { - _collectionNamespace = Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace)); - _key = Ensure.IsNotNull(key, nameof(key)); - _initial = Ensure.IsNotNull(initial, nameof(initial)); - _reduceFunction = Ensure.IsNotNull(reduceFunction, nameof(reduceFunction)); - _filter = filter; // can be null - _messageEncoderSettings = messageEncoderSettings; - } - - public GroupOperation(CollectionNamespace collectionNamespace, BsonJavaScript keyFunction, BsonDocument initial, BsonJavaScript reduceFunction, BsonDocument filter, MessageEncoderSettings messageEncoderSettings) - { - _collectionNamespace = Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace)); - _keyFunction = Ensure.IsNotNull(keyFunction, nameof(keyFunction)); - _initial = Ensure.IsNotNull(initial, nameof(initial)); - _reduceFunction = Ensure.IsNotNull(reduceFunction, nameof(reduceFunction)); - _filter = filter; - _messageEncoderSettings = messageEncoderSettings; - } - - public Collation Collation - { - get { return _collation; } - set { _collation = value; } - } - - public CollectionNamespace CollectionNamespace - { - get { return _collectionNamespace; } - } - - public BsonDocument Filter - { - get { return _filter; } - } - - public BsonJavaScript FinalizeFunction - { - get { return _finalizeFunction; } - set { _finalizeFunction = value; } - } - - public BsonDocument Initial - { - get { return _initial; } - } - - public BsonDocument Key - { - get { return _key; } - } - - public BsonJavaScript KeyFunction - { - get { return _keyFunction; } - } - - public TimeSpan? MaxTime - { - get { return _maxTime; } - set { _maxTime = Ensure.IsNullOrInfiniteOrGreaterThanOrEqualToZero(value, nameof(value)); } - } - - public MessageEncoderSettings MessageEncoderSettings - { - get { return _messageEncoderSettings; } - } - - public BsonJavaScript ReduceFunction - { - get { return _reduceFunction; } - } - - public IBsonSerializer ResultSerializer - { - get { return _resultSerializer; } - set { _resultSerializer = value; } - } - - public BsonDocument CreateCommand() - { - return new BsonDocument - { - { "group", new BsonDocument - { - { "ns", _collectionNamespace.CollectionName }, - { "key", _key, _key != null }, - { "$keyf", _keyFunction, _keyFunction != null }, - { "$reduce", _reduceFunction }, - { "initial", _initial }, - { "cond", _filter, _filter != null }, - { "finalize", _finalizeFunction, _finalizeFunction != null }, - { "collation", () => _collation.ToBsonDocument(), _collation != null } - } - }, - { "maxTimeMS", () => MaxTimeHelper.ToMaxTimeMS(_maxTime.Value), _maxTime.HasValue } - }; - } - - public IEnumerable Execute(OperationContext operationContext, IReadBinding binding) - { - Ensure.IsNotNull(binding, nameof(binding)); - using (var channelSource = binding.GetReadChannelSource(operationContext)) - using (var channel = channelSource.GetChannel(operationContext)) - using (var channelBinding = new ChannelReadBinding(channelSource.Server, channel, binding.ReadPreference, binding.Session.Fork())) - { - var operation = CreateOperation(); - return operation.Execute(operationContext, channelBinding); - } - } - - public async Task> ExecuteAsync(OperationContext operationContext, IReadBinding binding) - { - Ensure.IsNotNull(binding, nameof(binding)); - using (var channelSource = await binding.GetReadChannelSourceAsync(operationContext).ConfigureAwait(false)) - using (var channel = await channelSource.GetChannelAsync(operationContext).ConfigureAwait(false)) - using (var channelBinding = new ChannelReadBinding(channelSource.Server, channel, binding.ReadPreference, binding.Session.Fork())) - { - var operation = CreateOperation(); - return await operation.ExecuteAsync(operationContext, channelBinding).ConfigureAwait(false); - } - } - - private ReadCommandOperation CreateOperation() - { - var command = CreateCommand(); - var resultSerializer = _resultSerializer ?? BsonSerializer.LookupSerializer(); - var resultArraySerializer = new ArraySerializer(resultSerializer); - var commandResultSerializer = new ElementDeserializer("retval", resultArraySerializer); - return new ReadCommandOperation(_collectionNamespace.DatabaseNamespace, command, commandResultSerializer, _messageEncoderSettings) - { - RetryRequested = false - }; - } - } -} diff --git a/src/MongoDB.Driver/Core/WireProtocol/CommandWireProtocol.cs b/src/MongoDB.Driver/Core/WireProtocol/CommandWireProtocol.cs index 3844f13aec0..f80a2109830 100644 --- a/src/MongoDB.Driver/Core/WireProtocol/CommandWireProtocol.cs +++ b/src/MongoDB.Driver/Core/WireProtocol/CommandWireProtocol.cs @@ -205,7 +205,7 @@ private IWireProtocol CreateSupportedWireProtocol(IConnection co } else { - // The driver doesn't support servers less than 4.0. However it's still useful to support OP_QUERY for initial handshake. + // The driver doesn't support servers less than 4.2. However it's still useful to support OP_QUERY for initial handshake. // For pre-3.6 servers, it will allow throwing unsupported wire protocol exception on the driver side. // If we only supported OP_MSG, we would throw a general server error about closing connection without actual reason of why it happened return _cachedWireProtocol = CreateCommandUsingQueryMessageWireProtocol(); diff --git a/src/MongoDB.Driver/CreateCollectionOptions.cs b/src/MongoDB.Driver/CreateCollectionOptions.cs index 9e0e19e5a44..e5e62381158 100644 --- a/src/MongoDB.Driver/CreateCollectionOptions.cs +++ b/src/MongoDB.Driver/CreateCollectionOptions.cs @@ -120,6 +120,7 @@ public long? MaxSize /// /// Gets or sets whether padding should not be used. /// + [Obsolete("This option was removed in server version 4.2. As such, this property will be removed in a later release.")] public bool? NoPadding { get { return _noPadding; } @@ -156,6 +157,7 @@ public TimeSeriesOptions TimeSeriesOptions /// /// Gets or sets a value indicating whether to use power of 2 sizes. /// + [Obsolete("This option was removed in server version 4.2. As such, this property will be removed in a later release.")] public bool? UsePowerOf2Sizes { get { return _usePowerOf2Sizes; } @@ -201,11 +203,9 @@ public virtual CreateCollectionOptions Clone() => _indexOptionDefaults = _indexOptionDefaults, _maxDocuments = _maxDocuments, _maxSize = _maxSize, - _noPadding = _noPadding, _serializerRegistry = _serializerRegistry, _storageEngine = _storageEngine, _timeSeriesOptions = _timeSeriesOptions, - _usePowerOf2Sizes = _usePowerOf2Sizes, _validationAction = _validationAction, _validationLevel = _validationLevel }; @@ -243,11 +243,9 @@ internal static CreateCollectionOptions CoercedFrom(CreateCollectionO IndexOptionDefaults = options.IndexOptionDefaults, MaxDocuments = options.MaxDocuments, MaxSize = options.MaxSize, - NoPadding = options.NoPadding, SerializerRegistry = options.SerializerRegistry, StorageEngine = options.StorageEngine, TimeSeriesOptions = options.TimeSeriesOptions, - UsePowerOf2Sizes = options.UsePowerOf2Sizes, ValidationAction = options.ValidationAction, ValidationLevel = options.ValidationLevel }; @@ -308,11 +306,9 @@ public override CreateCollectionOptions Clone() => IndexOptionDefaults = base.IndexOptionDefaults, MaxDocuments = base.MaxDocuments, MaxSize = base.MaxSize, - NoPadding = base.NoPadding, SerializerRegistry = base.SerializerRegistry, StorageEngine = base.StorageEngine, TimeSeriesOptions = base.TimeSeriesOptions, - UsePowerOf2Sizes = base.UsePowerOf2Sizes, ValidationAction = base.ValidationAction, ValidationLevel = base.ValidationLevel, diff --git a/src/MongoDB.Driver/MongoDatabase.cs b/src/MongoDB.Driver/MongoDatabase.cs index 00a91ca35e5..ba942b62d70 100644 --- a/src/MongoDB.Driver/MongoDatabase.cs +++ b/src/MongoDB.Driver/MongoDatabase.cs @@ -634,10 +634,8 @@ private IWriteOperation CreateCreateCollectionOperation cco.IndexOptionDefaults = options.IndexOptionDefaults?.ToBsonDocument(); cco.MaxDocuments = options.MaxDocuments; cco.MaxSize = options.MaxSize; - cco.NoPadding = options.NoPadding; cco.StorageEngine = options.StorageEngine; cco.TimeSeriesOptions = options.TimeSeriesOptions; - cco.UsePowerOf2Sizes = options.UsePowerOf2Sizes; cco.ValidationAction = options.ValidationAction; cco.ValidationLevel = options.ValidationLevel; cco.Validator = validator; diff --git a/tests/MongoDB.Driver.TestHelpers/Core/CoreTestConfiguration.cs b/tests/MongoDB.Driver.TestHelpers/Core/CoreTestConfiguration.cs index aae52d93b19..8a2984ff2c4 100644 --- a/tests/MongoDB.Driver.TestHelpers/Core/CoreTestConfiguration.cs +++ b/tests/MongoDB.Driver.TestHelpers/Core/CoreTestConfiguration.cs @@ -485,7 +485,7 @@ private static string GetStorageEngine() break; } - return result ?? "mmapv1"; + return result ?? "wiredTiger"; string GetStorageEngineForCluster(IClusterInternal cluster) { diff --git a/tests/MongoDB.Driver.Tests/Core/Clusters/ClusterTests.cs b/tests/MongoDB.Driver.Tests/Core/Clusters/ClusterTests.cs index 7a3244b229d..c2b9bdcf01a 100644 --- a/tests/MongoDB.Driver.Tests/Core/Clusters/ClusterTests.cs +++ b/tests/MongoDB.Driver.Tests/Core/Clusters/ClusterTests.cs @@ -64,7 +64,7 @@ public void SupportedWireVersionRange_should_return_expected_result() { var result = Cluster.SupportedWireVersionRange; - result.Should().Be(new Range(7, 27)); + result.Should().Be(new Range(8, 27)); } [Fact] diff --git a/tests/MongoDB.Driver.Tests/Core/Connections/HelloHelperTests.cs b/tests/MongoDB.Driver.Tests/Core/Connections/HelloHelperTests.cs index c16c62505ff..26782c91b55 100644 --- a/tests/MongoDB.Driver.Tests/Core/Connections/HelloHelperTests.cs +++ b/tests/MongoDB.Driver.Tests/Core/Connections/HelloHelperTests.cs @@ -44,7 +44,7 @@ public void CreateCommand_should_return_correct_hello_command(bool useServerApiV [Theory] [ParameterAttributeData] public void AddClientDocumentToCommand_with_custom_document_should_return_expected_result( - [Values("{ client : { driver : 'dotnet', version : '4.0.0' }, os : { type : 'Windows' } }")] + [Values("{ client : { driver : 'dotnet', version : '4.2.0' }, os : { type : 'Windows' } }")] string clientDocumentString) { var clientDocument = BsonDocument.Parse(clientDocumentString); diff --git a/tests/MongoDB.Driver.Tests/Core/DatabaseNamespaceTests.cs b/tests/MongoDB.Driver.Tests/Core/DatabaseNamespaceTests.cs index 0625103a527..f6496a91181 100644 --- a/tests/MongoDB.Driver.Tests/Core/DatabaseNamespaceTests.cs +++ b/tests/MongoDB.Driver.Tests/Core/DatabaseNamespaceTests.cs @@ -76,7 +76,9 @@ public void SystemIndexesCollection_should_return_the_system_indexes_collection( { var subject = new DatabaseNamespace("test"); +#pragma warning disable CS0618 // Type or member is obsolete var commandCollection = subject.SystemIndexesCollection; +#pragma warning restore CS0618 // Type or member is obsolete commandCollection.FullName.Should().Be("test.system.indexes"); } @@ -85,7 +87,9 @@ public void SystemNamespacesCollection_should_return_the_system_namespaces_colle { var subject = new DatabaseNamespace("test"); +#pragma warning disable CS0618 // Type or member is obsolete var commandCollection = subject.SystemNamespacesCollection; +#pragma warning restore CS0618 // Type or member is obsolete commandCollection.FullName.Should().Be("test.system.namespaces"); } diff --git a/tests/MongoDB.Driver.Tests/Core/Jira/CSharp3173Tests.cs b/tests/MongoDB.Driver.Tests/Core/Jira/CSharp3173Tests.cs index 8be118b9db5..b1b3e1c042c 100644 --- a/tests/MongoDB.Driver.Tests/Core/Jira/CSharp3173Tests.cs +++ b/tests/MongoDB.Driver.Tests/Core/Jira/CSharp3173Tests.cs @@ -301,7 +301,7 @@ private void SetupServerMonitorConnection( bool streamable) { var connectionId = new ConnectionId(serverId); - var maxWireVersion = streamable ? WireVersion.Server44 : WireVersion.Server40; + var maxWireVersion = streamable ? WireVersion.Server44 : WireVersion.Server42; var helloDocument = new BsonDocument { { "ok", 1 }, diff --git a/tests/MongoDB.Driver.Tests/Core/Jira/CSharp3302Tests.cs b/tests/MongoDB.Driver.Tests/Core/Jira/CSharp3302Tests.cs index aa944ed0ca6..69e47190822 100644 --- a/tests/MongoDB.Driver.Tests/Core/Jira/CSharp3302Tests.cs +++ b/tests/MongoDB.Driver.Tests/Core/Jira/CSharp3302Tests.cs @@ -282,8 +282,8 @@ private void SetupServerMonitorConnection( var baseDocument = new BsonDocument { { "ok", 1 }, - { "minWireVersion", WireVersion.Server36 }, - { "maxWireVersion", WireVersion.Server40 }, + { "minWireVersion", WireVersion.Server42 }, + { "maxWireVersion", WireVersion.Server44 }, { "setName", "rs" }, { "hosts", new BsonArray(new [] { "localhost:27017", "localhost:27018" })}, { "topologyVersion", new TopologyVersion(ObjectId.Empty, 1).ToBsonDocument(), false } diff --git a/tests/MongoDB.Driver.Tests/Core/Misc/WireVersionTests.cs b/tests/MongoDB.Driver.Tests/Core/Misc/WireVersionTests.cs index 161b4908c0e..0e4566d9a09 100644 --- a/tests/MongoDB.Driver.Tests/Core/Misc/WireVersionTests.cs +++ b/tests/MongoDB.Driver.Tests/Core/Misc/WireVersionTests.cs @@ -47,7 +47,7 @@ public void GetServerVersionForErrorMessage_should_return_expected_serverVersion [Fact] public void SupportedWireRange_should_be_correct() { - WireVersion.SupportedWireVersionRange.Should().Be(new Range(7, 27)); + WireVersion.SupportedWireVersionRange.Should().Be(new Range(8, 27)); } [Fact] diff --git a/tests/MongoDB.Driver.Tests/Core/Operations/CreateCollectionOperationTests.cs b/tests/MongoDB.Driver.Tests/Core/Operations/CreateCollectionOperationTests.cs index 37bb5aaf6e0..a89f27c1a0a 100644 --- a/tests/MongoDB.Driver.Tests/Core/Operations/CreateCollectionOperationTests.cs +++ b/tests/MongoDB.Driver.Tests/Core/Operations/CreateCollectionOperationTests.cs @@ -76,9 +76,7 @@ public void constructor_should_initialize_subject() subject.IndexOptionDefaults.Should().BeNull(); subject.MaxDocuments.Should().NotHaveValue(); subject.MaxSize.Should().NotHaveValue(); - subject.NoPadding.Should().NotHaveValue(); subject.StorageEngine.Should().BeNull(); - subject.UsePowerOf2Sizes.Should().NotHaveValue(); subject.ValidationAction.Should().BeNull(); subject.ValidationLevel.Should().BeNull(); subject.Validator.Should().BeNull(); @@ -266,28 +264,6 @@ public void CreateCommand_should_return_expected_result_when_MaxSize_is_set( result.Should().Be(expectedResult); } - [Theory] - [ParameterAttributeData] - public void CreateCommand_should_return_expected_result_when_NoPadding_is_set( - [Values(null, false, true)] - bool? noPadding) - { - var subject = new CreateCollectionOperation(_collectionNamespace, _messageEncoderSettings) - { - NoPadding = noPadding - }; - var session = OperationTestHelper.CreateSession(); - - var result = subject.CreateCommand(session); - - var expectedResult = new BsonDocument - { - { "create", _collectionNamespace.CollectionName }, - { "flags", () => noPadding.Value ? 2 : 0, noPadding != null } - }; - result.Should().Be(expectedResult); - } - [Theory] [ParameterAttributeData] public void CreateCommand_should_return_expected_result_when_StorageEngine_is_set( @@ -311,28 +287,6 @@ public void CreateCommand_should_return_expected_result_when_StorageEngine_is_se result.Should().Be(expectedResult); } - [Theory] - [ParameterAttributeData] - public void CreateCommand_should_return_expected_result_when_UsePowerOf2Sizes_is_set( - [Values(null, false, true)] - bool? usePowerOf2Sizes) - { - var subject = new CreateCollectionOperation(_collectionNamespace, _messageEncoderSettings) - { - UsePowerOf2Sizes = usePowerOf2Sizes - }; - var session = OperationTestHelper.CreateSession(); - - var result = subject.CreateCommand(session); - - var expectedResult = new BsonDocument - { - { "create", _collectionNamespace.CollectionName }, - { "flags", () => usePowerOf2Sizes.Value ? 1 : 0, usePowerOf2Sizes != null } - }; - result.Should().Be(expectedResult); - } - [Theory] [ParameterAttributeData] public void CreateCommand_should_return_expected_result_when_ValidationAction_is_set( @@ -700,31 +654,6 @@ public void Execute_should_create_collection_when_MaxSize_is_set( info["options"]["size"].ToInt64().Should().BeGreaterOrEqualTo(maxSize); // server rounds maxSize up } - [Theory] - [ParameterAttributeData] - public void Execute_should_create_collection_when_NoPadding_is_set( - [Values(false, true)] - bool noPadding, - [Values(false, true)] - bool async) - { - RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet).StorageEngine("mmapv1"); - DropCollection(); - var subject = new CreateCollectionOperation(_collectionNamespace, _messageEncoderSettings) - { - NoPadding = noPadding - }; - - BsonDocument info; - using (var binding = CreateReadWriteBinding()) - { - ExecuteOperation(subject, binding, async); - info = GetCollectionInfo(binding); - } - - info["options"]["flags"].Should().Be(noPadding ? 2 : 0); - } - [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_StorageEngine_is_set( @@ -754,31 +683,6 @@ public void Execute_should_create_collection_when_StorageEngine_is_set( info["options"]["storageEngine"].Should().Be(storageEngine); } - [Theory] - [ParameterAttributeData] - public void Execute_should_create_collection_when_UsePowerOf2Sizes_is_set( - [Values(false, true)] - bool usePowerOf2Sizes, - [Values(false, true)] - bool async) - { - RequireServer.Check().ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet).StorageEngine("mmapv1"); - DropCollection(); - var subject = new CreateCollectionOperation(_collectionNamespace, _messageEncoderSettings) - { - UsePowerOf2Sizes = usePowerOf2Sizes - }; - - BsonDocument info; - using (var binding = CreateReadWriteBinding()) - { - ExecuteOperation(subject, binding, async); - info = GetCollectionInfo(binding); - } - - info["options"]["flags"].Should().Be(usePowerOf2Sizes ? 1 : 0); - } - [Theory] [ParameterAttributeData] public void Execute_should_create_collection_when_Validator_is_set( @@ -925,20 +829,6 @@ public void MaxSize_set_should_throw_when_value_is_invalid( argumentOutOfRangeException.ParamName.Should().Be("value"); } - [Theory] - [ParameterAttributeData] - public void NoPadding_get_and_set_should_work( - [Values(null, false, true)] - bool? value) - { - var subject = new CreateCollectionOperation(_collectionNamespace, _messageEncoderSettings); - - subject.NoPadding = value; - var result = subject.NoPadding; - - result.Should().Be(value); - } - [Theory] [ParameterAttributeData] public void StorageEngine_get_and_set_should_work( @@ -954,20 +844,6 @@ public void StorageEngine_get_and_set_should_work( result.Should().BeSameAs(value); } - [Theory] - [ParameterAttributeData] - public void UsePowerOf2Sizes_get_and_set_should_work( - [Values(null, false, true)] - bool? value) - { - var subject = new CreateCollectionOperation(_collectionNamespace, _messageEncoderSettings); - - subject.UsePowerOf2Sizes = value; - var result = subject.UsePowerOf2Sizes; - - result.Should().Be(value); - } - [Theory] [ParameterAttributeData] public void ValidationAction_get_and_set_should_work( diff --git a/tests/MongoDB.Driver.Tests/Core/Operations/EvalOperationTests.cs b/tests/MongoDB.Driver.Tests/Core/Operations/EvalOperationTests.cs deleted file mode 100644 index b01a431d766..00000000000 --- a/tests/MongoDB.Driver.Tests/Core/Operations/EvalOperationTests.cs +++ /dev/null @@ -1,315 +0,0 @@ -/* Copyright 2013-present 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. -*/ - -using System; -using System.Threading; -using System.Threading.Tasks; -using FluentAssertions; -using MongoDB.Bson; -using MongoDB.TestHelpers.XunitExtensions; -using MongoDB.Driver.Core.Bindings; -using MongoDB.Driver.Core.Clusters; -using MongoDB.Driver.Core.Misc; -using MongoDB.Driver.Core.TestHelpers; -using MongoDB.Driver.Core.TestHelpers.XunitExtensions; -using MongoDB.Driver.Core.WireProtocol.Messages.Encoders; -using Xunit; - -namespace MongoDB.Driver.Core.Operations -{ - public class EvalOperationTests : OperationTestBase - { - private DatabaseNamespace _adminDatabaseNamespace; - - public EvalOperationTests() - { - _adminDatabaseNamespace = DatabaseNamespace.Admin; - } - - [Fact] - public void Args_should_work() - { - var function = new BsonJavaScript("return 1"); - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - var args = new BsonValue[] { 1, 2, 3 }; - - subject.Args = args; - - subject.Args.Should().Equal(args); - } - - [Fact] - public void constructor_should_initialize_subject() - { - var function = new BsonJavaScript("return 1"); - - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - - subject.Args.Should().BeNull(); - subject.DatabaseNamespace.Should().Be(_adminDatabaseNamespace); - subject.Function.Should().Be(function); - subject.MaxTime.Should().NotHaveValue(); - // subject.MessageEncoderSettings.Should().Be(_messageEncoderSettings); - Assert.Equal(_messageEncoderSettings, subject.MessageEncoderSettings); - subject.NoLock.Should().NotHaveValue(); - } - - [Fact] - public void constructor_should_throw_when_databaseNamespace_is_null() - { - var function = new BsonJavaScript("return 1"); - - Action action = () => new EvalOperation(null, function, _messageEncoderSettings); - - action.ShouldThrow(); - } - - [Fact] - public void constructor_should_throw_when_function_is_null() - { - Action action = () => new EvalOperation(_adminDatabaseNamespace, null, _messageEncoderSettings); - - action.ShouldThrow(); - } - - [Fact] - public void CreateCommand_should_return_expected_result() - { - var function = new BsonJavaScript("return 1"); - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - var expectedResult = new BsonDocument - { - { "$eval", function } - }; - - var result = subject.CreateCommand(); - - result.Should().Be(expectedResult); - } - - [Fact] - public void CreateCommand_should_return_expected_result_when_args_are_provided() - { - var function = new BsonJavaScript("return 1"); - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - var args = new BsonValue[] { 1, 2, 3 }; - subject.Args = args; - var expectedResult = new BsonDocument - { - { "$eval", function }, - { "args", new BsonArray(args) } - }; - - var result = subject.CreateCommand(); - - result.Should().Be(expectedResult); - } - - [Theory] - [InlineData(-10000, 0)] - [InlineData(0, 0)] - [InlineData(1, 1)] - [InlineData(9999, 1)] - [InlineData(10000, 1)] - [InlineData(10001, 2)] - public void CreateCommand_should_return_expected_result_when_MaxTime_is_set(long maxTimeTicks, int expectedMaxTimeMS) - { - var function = new BsonJavaScript("return 1"); - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings) - { - MaxTime = TimeSpan.FromTicks(maxTimeTicks) - }; - var expectedResult = new BsonDocument - { - { "$eval", function }, - { "maxTimeMS", expectedMaxTimeMS } - }; - - var result = subject.CreateCommand(); - - result.Should().Be(expectedResult); - result["maxTimeMS"].BsonType.Should().Be(BsonType.Int32); - } - - [Fact] - public void CreateCommand_should_return_expected_result_when_noLock_is_provided() - { - var function = new BsonJavaScript("return 1"); - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - subject.NoLock = true; - var expectedResult = new BsonDocument - { - { "$eval", function }, - { "nolock", true } - }; - - var result = subject.CreateCommand(); - - result.Should().Be(expectedResult); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result( - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.Eval).Authentication(false); - var function = "return 1"; - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - - var result = ExecuteOperation(subject, async); - - result.Should().Be(1.0); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_args_are_provided( - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.Eval).Authentication(false); - var function = "function(x) { return x; }"; - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - subject.Args = new BsonValue[] { 1 }; - - var result = ExecuteOperation(subject, async); - - result.Should().Be(1.0); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_maxTime_is_provided( - [Values(false, true)] - bool async) - { - // TODO: implement EvalOperation MaxTime test - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_noLock_is_provided( - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.Eval).Authentication(false); - var function = "return 1"; - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - subject.NoLock = true; - - var result = ExecuteOperation(subject, async); - - result.Should().Be(1.0); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_throw_when_binding_isNull( - [Values(false, true)] - bool async) - { - var function = "return 1"; - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - - Action action = () => ExecuteOperation(subject, null, async); - - action.ShouldThrow(); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_throw_when_maxTime_is_exceeded( - [Values(false, true)] bool async) - { - RequireServer.Check().Supports(Feature.Eval).Authentication(false).ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet); - var function = "return 1"; - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings) { MaxTime = TimeSpan.FromSeconds(9001) }; - - using (var failPoint = FailPoint.ConfigureAlwaysOn(_cluster, _session, FailPointName.MaxTimeAlwaysTimeout)) - { - var exception = Record.Exception(() => ExecuteOperation(subject, failPoint.Binding, async)); - - exception.Should().BeOfType(); - } - } - - [Theory] - [ParameterAttributeData] - public void MaxTime_get_and_set_should_work( - [Values(-10000, 0, 1, 10000, 99999)] long maxTimeTicks) - { - var function = new BsonJavaScript("return 1"); - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - var value = TimeSpan.FromTicks(maxTimeTicks); - - subject.MaxTime = value; - var result = subject.MaxTime; - - result.Should().Be(value); - } - - [Theory] - [ParameterAttributeData] - public void MaxTime_set_should_throw_when_value_is_invalid( - [Values(-10001, -9999, -1)] long maxTimeTicks) - { - var function = new BsonJavaScript("return 1"); - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - var value = TimeSpan.FromTicks(maxTimeTicks); - - var exception = Record.Exception(() => subject.MaxTime = value); - - var e = exception.Should().BeOfType().Subject; - e.ParamName.Should().Be("value"); - } - - [Theory] - [ParameterAttributeData] - public void NoLock_should_work( - [Values(null, false, true)] - bool? value) - { - var function = new BsonJavaScript("return 1"); - var subject = new EvalOperation(_adminDatabaseNamespace, function, _messageEncoderSettings); - - subject.NoLock = value; - - subject.NoLock.Should().Be(value); - } - - // private methods - private BsonValue ExecuteOperation(EvalOperation operation, bool async) - { - using (var binding = CreateReadWriteBinding()) - { - return ExecuteOperation(operation, binding, async); - } - } - - private BsonValue ExecuteOperation(EvalOperation operation, IWriteBinding binding, bool async) - { - if (async) - { - return operation.ExecuteAsync(OperationContext.NoTimeout, binding).GetAwaiter().GetResult(); - } - else - { - return operation.Execute(OperationContext.NoTimeout, binding); - } - } - } -} diff --git a/tests/MongoDB.Driver.Tests/Core/Operations/GroupOperationTests.cs b/tests/MongoDB.Driver.Tests/Core/Operations/GroupOperationTests.cs deleted file mode 100644 index 5bcfde3d6d8..00000000000 --- a/tests/MongoDB.Driver.Tests/Core/Operations/GroupOperationTests.cs +++ /dev/null @@ -1,566 +0,0 @@ -/* Copyright 2013-present 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. -*/ - -using System; -using System.Threading; -using FluentAssertions; -using MongoDB.Bson; -using MongoDB.Bson.Serialization.Serializers; -using MongoDB.TestHelpers.XunitExtensions; -using MongoDB.Driver.Core.Clusters; -using MongoDB.Driver.Core.Misc; -using MongoDB.Driver.Core.TestHelpers; -using MongoDB.Driver.Core.TestHelpers.XunitExtensions; -using Xunit; - -namespace MongoDB.Driver.Core.Operations -{ - public class GroupOperationTests : OperationTestBase - { - private readonly BsonDocument _filter = BsonDocument.Parse("{ y : 'a' }"); - private readonly BsonJavaScript _finalizeFunction = new BsonJavaScript("function(result) { result.count = -result.count; }"); - private readonly BsonDocument _initial = BsonDocument.Parse("{ count : 0.0 }"); - private readonly BsonDocument _key = BsonDocument.Parse("{ x : 1 }"); - private readonly BsonJavaScript _keyFunction = new BsonJavaScript("function(doc) { return { x : doc.x }; }"); - private readonly BsonJavaScript _reduceFunction = new BsonJavaScript("function(doc, result) { result.count += 1; }"); - - [Fact] - public void constructor_with_key_should_initialize_subject() - { - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, _filter, _messageEncoderSettings); - - subject.CollectionNamespace.Should().BeSameAs(_collectionNamespace); - subject.Key.Should().BeSameAs(_key); - subject.Initial.Should().BeSameAs(_initial); - subject.ReduceFunction.Should().BeSameAs(_reduceFunction); - subject.Filter.Should().BeSameAs(_filter); - subject.MessageEncoderSettings.Should().BeSameAs(_messageEncoderSettings); - - subject.Collation.Should().BeNull(); - subject.FinalizeFunction.Should().BeNull(); - subject.KeyFunction.Should().BeNull(); - subject.MaxTime.Should().NotHaveValue(); - subject.ResultSerializer.Should().BeNull(); - } - - [Fact] - public void constructor_with_key_should_throw_when_collectionNamespace_is_null() - { - var exception = Record.Exception(() => new GroupOperation(null, _key, _initial, _reduceFunction, _filter, _messageEncoderSettings)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("collectionNamespace"); - } - - [Fact] - public void constructor_with_key_should_throw_when_key_is_null() - { - var exception = Record.Exception(() => new GroupOperation(_collectionNamespace, (BsonDocument)null, _initial, _reduceFunction, _filter, _messageEncoderSettings)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("key"); - } - - [Fact] - public void constructor_with_key_should_throw_when_initial_is_null() - { - var exception = Record.Exception(() => new GroupOperation(_collectionNamespace, _key, null, _reduceFunction, _filter, _messageEncoderSettings)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("initial"); - } - - [Fact] - public void constructor_with_key_should_throw_when_reduceFunction_is_null() - { - var exception = Record.Exception(() => new GroupOperation(_collectionNamespace, _key, _initial, null, _filter, _messageEncoderSettings)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("reduceFunction"); - } - - [Fact] - public void constructor_with_keyFunction_should_initialize_subject() - { - var subject = new GroupOperation(_collectionNamespace, _keyFunction, _initial, _reduceFunction, _filter, _messageEncoderSettings); - - subject.CollectionNamespace.Should().Be(_collectionNamespace); - subject.KeyFunction.Should().Be(_keyFunction); - subject.Initial.Should().Be(_initial); - subject.ReduceFunction.Should().Be(_reduceFunction); - subject.Filter.Should().Be(_filter); - subject.MessageEncoderSettings.Should().BeSameAs(_messageEncoderSettings); - - subject.Collation.Should().BeNull(); - subject.FinalizeFunction.Should().BeNull(); - subject.Key.Should().BeNull(); - subject.MaxTime.Should().Be(default(TimeSpan?)); - subject.ResultSerializer.Should().BeNull(); - } - - [Fact] - public void constructor_with_keyFunction_should_throw_when_collectionNamespace_is_null() - { - var exception = Record.Exception(() => new GroupOperation(null, _keyFunction, _initial, _reduceFunction, _filter, _messageEncoderSettings)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("collectionNamespace"); - } - - [Fact] - public void constructor_with_keyFunction_should_throw_when_keyFunction_is_null() - { - var exception = Record.Exception(() => new GroupOperation(_collectionNamespace, (BsonJavaScript)null, _initial, _reduceFunction, _filter, _messageEncoderSettings)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("keyFunction"); - } - - [Fact] - public void constructor_with_keyFunction_should_throw_when_initial_is_null() - { - var exception = Record.Exception(() => new GroupOperation(_collectionNamespace, _keyFunction, null, _reduceFunction, _filter, _messageEncoderSettings)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("initial"); - } - - [Fact] - public void constructor_with_keyFunction_should_throw_when_reduceFunction_is_null() - { - var exception = Record.Exception(() => new GroupOperation(_collectionNamespace, _keyFunction, _initial, null, _filter, _messageEncoderSettings)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("reduceFunction"); - } - - [Theory] - [ParameterAttributeData] - public void Collation_get_and_set_should_work( - [Values(null, "en_US", "fr_CA")] - string locale) - { - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, _filter, _messageEncoderSettings); - var value = locale == null ? null : new Collation(locale); - - subject.Collation = value; - var result = subject.Collation; - - result.Should().BeSameAs(value); - } - - [Theory] - [ParameterAttributeData] - public void FinalizeFunction_get_and_set_should_work( - [Values(null, "x", "y")] - string code) - { - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, _filter, _messageEncoderSettings); - var value = code == null ? null : new BsonJavaScript(code); - - subject.FinalizeFunction = value; - var result = subject.FinalizeFunction; - - result.Should().BeSameAs(value); - } - - [Theory] - [ParameterAttributeData] - public void MaxTime_get_and_set_should_work( - [Values(-10000, 0, 1, 10000, 99999)] long maxTimeTicks) - { - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, _filter, _messageEncoderSettings); - var value = TimeSpan.FromTicks(maxTimeTicks); - - subject.MaxTime = value; - var result = subject.MaxTime; - - result.Should().Be(value); - } - - [Theory] - [ParameterAttributeData] - public void MaxTime_set_should_throw_when_value_is_invalid( - [Values(-10001, -9999, -1)] long maxTimeTicks) - { - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, _filter, _messageEncoderSettings); - var value = TimeSpan.FromTicks(maxTimeTicks); - - var exception = Record.Exception(() => subject.MaxTime = value); - - var e = exception.Should().BeOfType().Subject; - e.ParamName.Should().Be("value"); - } - - [Theory] - [ParameterAttributeData] - public void ResultSerializer_get_and_set_should_work( - [Values(false, true)] - bool isNull) - { - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, _filter, _messageEncoderSettings); - var value = isNull ? null : new BsonDocumentSerializer(); - - subject.ResultSerializer = value; - var result = subject.ResultSerializer; - - result.Should().Be(value); - } - - [Theory] - [ParameterAttributeData] - public void CreateCommand_should_return_expected_result_when_key_is_used( - [Values(false, true)] - bool useFilter) - { - var filter = useFilter ? _filter : null; - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, filter, _messageEncoderSettings); - - var result = subject.CreateCommand(); - - var expectedResult = new BsonDocument - { - { "group", new BsonDocument - { - { "ns", _collectionNamespace.CollectionName }, - { "key", _key }, - { "$reduce", _reduceFunction }, - { "initial", _initial }, - { "cond", filter, filter != null } - } - } - }; - result.Should().Be(expectedResult); - } - - [Theory] - [ParameterAttributeData] - public void CreateCommand_should_return_expected_result_when_keyFunction_is_used( - [Values(false, true)] - bool isFilterNull) - { - var filter = isFilterNull ? _filter : null; - var subject = new GroupOperation(_collectionNamespace, _keyFunction, _initial, _reduceFunction, filter, _messageEncoderSettings); - - var result = subject.CreateCommand(); - - var expectedResult = new BsonDocument - { - { "group", new BsonDocument - { - { "ns", _collectionNamespace.CollectionName }, - { "$keyf", _keyFunction }, - { "$reduce", _reduceFunction }, - { "initial", _initial }, - { "cond", filter, filter != null } - } - } - }; - result.Should().Be(expectedResult); - } - - [Theory] - [ParameterAttributeData] - public void CreateCommand_should_return_expected_result_when_finalizeFunction_is_set( - [Values(false, true)] - bool isFinalizeFunctionNull) - { - var finalizeFunction = isFinalizeFunctionNull ? null : _finalizeFunction; - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings) - { - FinalizeFunction = finalizeFunction - }; - - var result = subject.CreateCommand(); - - var expectedResult = new BsonDocument - { - { "group", new BsonDocument - { - { "ns", _collectionNamespace.CollectionName }, - { "key", _key }, - { "$reduce", _reduceFunction }, - { "initial", _initial }, - { "finalize", finalizeFunction, finalizeFunction != null } - } - } - }; - result.Should().Be(expectedResult); - } - - [Theory] - [ParameterAttributeData] - public void CreateCommand_should_return_expected_result_when_Collation_is_set( - [Values(null, "en_US", "fr_CA")] - string locale) - { - var collation = locale == null ? null : new Collation(locale); - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings) - { - Collation = collation - }; - - var result = subject.CreateCommand(); - - var expectedResult = new BsonDocument - { - { "group", new BsonDocument - { - { "ns", _collectionNamespace.CollectionName }, - { "key", _key }, - { "$reduce", _reduceFunction }, - { "initial", _initial }, - { "collation", () => collation.ToBsonDocument(), collation != null } - } - } - }; - result.Should().Be(expectedResult); - } - - [Theory] - [InlineData(-10000, 0)] - [InlineData(0, 0)] - [InlineData(1, 1)] - [InlineData(9999, 1)] - [InlineData(10000, 1)] - [InlineData(10001, 2)] - public void CreateCommand_should_return_expected_result_when_MaxTime_is_set(long maxTimeTicks, int expectedMaxTimeMS) - { - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings) - { - MaxTime = TimeSpan.FromTicks(maxTimeTicks) - }; - - var result = subject.CreateCommand(); - - var expectedResult = new BsonDocument - { - { "group", new BsonDocument - { - { "ns", _collectionNamespace.CollectionName }, - { "key", _key }, - { "$reduce", _reduceFunction }, - { "initial", _initial } - } - }, - { "maxTimeMS", expectedMaxTimeMS } - }; - result.Should().Be(expectedResult); - result["maxTimeMS"].BsonType.Should().Be(BsonType.Int32); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_key_is_used( - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.GroupCommand); - EnsureTestData(); - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings); - - var result = ExecuteOperation(subject, async); - - result.Should().Equal( - BsonDocument.Parse("{ x : 1, count : 2 }"), - BsonDocument.Parse("{ x : 2, count : 1 }"), - BsonDocument.Parse("{ x : 3, count : 3 }")); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_keyFunction_is_used( - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.GroupCommand); - EnsureTestData(); - var subject = new GroupOperation(_collectionNamespace, _keyFunction, _initial, _reduceFunction, null, _messageEncoderSettings); - - var result = ExecuteOperation(subject, async); - - result.Should().Equal( - BsonDocument.Parse("{ x : 1, count : 2 }"), - BsonDocument.Parse("{ x : 2, count : 1 }"), - BsonDocument.Parse("{ x : 3, count : 3 }")); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_Collation_is_set( - [Values(false, true)] - bool caseSensitive, - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.GroupCommand); - EnsureTestData(); - var collation = new Collation("en_US", caseLevel: caseSensitive, strength: CollationStrength.Primary); - var filter = BsonDocument.Parse("{ y : 'a' }"); - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, filter, _messageEncoderSettings) - { - Collation = collation - }; - - var result = ExecuteOperation(subject, async); - - BsonDocument[] expectedResult; - if (caseSensitive) - { - expectedResult = new[] - { - BsonDocument.Parse("{ x : 1, count : 2 }"), - BsonDocument.Parse("{ x : 3, count : 2 }") - }; - } - else - { - expectedResult = new[] - { - BsonDocument.Parse("{ x : 1, count : 2 }"), - BsonDocument.Parse("{ x : 2, count : 1 }"), - BsonDocument.Parse("{ x : 3, count : 3 }") - }; - } - result.Should().Equal(expectedResult); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_FinalizeFunction_is_set( - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.GroupCommand); - EnsureTestData(); - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings) - { - FinalizeFunction = _finalizeFunction - }; - - var result = ExecuteOperation(subject, async); - - result.Should().Equal( - BsonDocument.Parse("{ x : 1, count : -2 }"), - BsonDocument.Parse("{ x : 2, count : -1 }"), - BsonDocument.Parse("{ x : 3, count : -3 }")); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_MaxTime_is_used( - [Values(null, 1000)] - int? seconds, - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.GroupCommand); - EnsureTestData(); - var maxTime = seconds.HasValue ? TimeSpan.FromSeconds(seconds.Value) : (TimeSpan?)null; - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings) - { - MaxTime = maxTime - }; - - // TODO: force a timeout on the server? for now we're just smoke testing - var result = ExecuteOperation(subject, async); - - result.Should().Equal( - BsonDocument.Parse("{ x : 1, count : 2 }"), - BsonDocument.Parse("{ x : 2, count : 1 }"), - BsonDocument.Parse("{ x : 3, count : 3 }")); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_return_expected_result_when_ResultSerializer_is_used( - [Values(false, true)] - bool async) - { - RequireServer.Check().Supports(Feature.GroupCommand); - EnsureTestData(); - var resultSerializer = new ElementDeserializer("x", new Int32Serializer()); - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings) - { - ResultSerializer = resultSerializer - }; - - var result = ExecuteOperation(subject, async); - - result.Should().Equal(1, 2, 3); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_throw_when_binding_is_null( - [Values(false, true)] - bool async) - { - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, _filter, _messageEncoderSettings); - - var exception = Record.Exception(() => ExecuteOperation(subject, binding: null, async)); - - var argumentNullException = exception.Should().BeOfType().Subject; - argumentNullException.ParamName.Should().Be("binding"); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_send_session_id_when_supported( - [Values(false, true)] bool async) - { - RequireServer.Check().Supports(Feature.GroupCommand); - EnsureTestData(); - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings); - - VerifySessionIdWasSentWhenSupported(subject, "group", async); - } - - [Theory] - [ParameterAttributeData] - public void Execute_should_throw_when_maxTime_is_exceeded( - [Values(false, true)] bool async) - { - RequireServer.Check().Supports(Feature.GroupCommand).ClusterTypes(ClusterType.Standalone, ClusterType.ReplicaSet); - var subject = new GroupOperation(_collectionNamespace, _key, _initial, _reduceFunction, null, _messageEncoderSettings); - subject.MaxTime = TimeSpan.FromSeconds(9001); - - using (var failPoint = FailPoint.ConfigureAlwaysOn(_cluster, _session, FailPointName.MaxTimeAlwaysTimeout)) - { - var exception = Record.Exception(() => ExecuteOperation(subject, failPoint.Binding, async)); - - exception.Should().BeOfType(); - } - } - - // helper methods - private void EnsureTestData() - { - RunOncePerFixture(() => - { - DropCollection(); - Insert( - BsonDocument.Parse("{ _id : 1, x : 1, y : 'a' }"), - BsonDocument.Parse("{ _id : 2, x : 1, y : 'a' }"), - BsonDocument.Parse("{ _id : 3, x : 2, y : 'A' }"), - BsonDocument.Parse("{ _id : 4, x : 3, y : 'a' }"), - BsonDocument.Parse("{ _id : 5, x : 3, y : 'a' }"), - BsonDocument.Parse("{ _id : 6, x : 3, y : 'A' }") - ); - CreateIndexes(new CreateIndexRequest(new BsonDocument("Location", "2d"))); - }); - } - } -} diff --git a/tests/MongoDB.Driver.Tests/Core/Servers/ServerDescriptionTests.cs b/tests/MongoDB.Driver.Tests/Core/Servers/ServerDescriptionTests.cs index 4f629ff7d9b..2ebceb191d0 100644 --- a/tests/MongoDB.Driver.Tests/Core/Servers/ServerDescriptionTests.cs +++ b/tests/MongoDB.Driver.Tests/Core/Servers/ServerDescriptionTests.cs @@ -261,33 +261,14 @@ public void Equals_should_return_true_when_all_fields_are_equal() [Theory] [InlineData(null, true)] [InlineData(new[] { 0, 0 }, false)] - [InlineData(new[] { 0, 1 }, false)] - [InlineData(new[] { 0, 2 }, false)] - [InlineData(new[] { 0, 6 }, false)] - [InlineData(new[] { 0, 7 }, true)] - [InlineData(new[] { 2, 2 }, false)] - [InlineData(new[] { 2, 6 }, false)] - [InlineData(new[] { 2, 7 }, true)] - [InlineData(new[] { 6, 6 }, false)] - [InlineData(new[] { 6, 7 }, true)] - [InlineData(new[] { 7, 7 }, true)] + [InlineData(new[] { 0, 7 }, false)] + [InlineData(new[] { 7, 7 }, false)] [InlineData(new[] { 7, 8 }, true)] - [InlineData(new[] { 10, 13 }, true)] - [InlineData(new[] { 10, 14 }, true)] - [InlineData(new[] { 13, 15 }, true)] - [InlineData(new[] { 14, 15 }, true)] - [InlineData(new[] { 15, 16 }, true)] - [InlineData(new[] { 16, 17 }, true)] - [InlineData(new[] { 18, 19 }, true)] - [InlineData(new[] { 19, 20 }, true)] - [InlineData(new[] { 20, 21 }, true)] - [InlineData(new[] { 21, 22 }, true)] - [InlineData(new[] { 22, 23 }, true)] - [InlineData(new[] { 23, 24 }, true)] - [InlineData(new[] { 24, 25 }, true)] - [InlineData(new[] { 25, 26 }, true)] - [InlineData(new[] { 26, 27 }, true)] + [InlineData(new[] { 8, 8 }, true)] + [InlineData(new[] { 8, 21 }, true)] + [InlineData(new[] { 27, 27 }, true)] [InlineData(new[] { 27, 28 }, true)] + [InlineData(new[] { 28, 28 }, false)] [InlineData(new[] { 28, 29 }, false)] public void IsCompatibleWithDriver_should_return_expected_result(int[] minMaxWireVersions, bool expectedResult) { diff --git a/tests/MongoDB.Driver.Tests/MongoDatabaseTests.cs b/tests/MongoDB.Driver.Tests/MongoDatabaseTests.cs index c2fc8f9166b..9ca955ef522 100644 --- a/tests/MongoDB.Driver.Tests/MongoDatabaseTests.cs +++ b/tests/MongoDB.Driver.Tests/MongoDatabaseTests.cs @@ -409,9 +409,7 @@ public void CreateCollection_should_execute_a_CreateCollectionOperation_when_opt IndexOptionDefaults = new IndexOptionDefaults { StorageEngine = new BsonDocument("x", 1) }, MaxDocuments = 10, MaxSize = 11, - NoPadding = true, StorageEngine = storageEngine, - UsePowerOf2Sizes = true, ValidationAction = DocumentValidationAction.Warn, ValidationLevel = DocumentValidationLevel.Off, Validator = validatorDefinition @@ -461,9 +459,7 @@ public void CreateCollection_should_execute_a_CreateCollectionOperation_when_opt op.IndexOptionDefaults.ToBsonDocument().Should().Be(options.IndexOptionDefaults.ToBsonDocument()); op.MaxDocuments.Should().Be(options.MaxDocuments); op.MaxSize.Should().Be(options.MaxSize); - op.NoPadding.Should().Be(options.NoPadding); op.StorageEngine.Should().Be(storageEngine); - op.UsePowerOf2Sizes.Should().Be(options.UsePowerOf2Sizes); op.ValidationAction.Should().Be(options.ValidationAction); op.ValidationLevel.Should().Be(options.ValidationLevel); op.Validator.Should().Be(validatorDocument); @@ -488,9 +484,7 @@ public void CreateCollection_should_execute_a_CreateCollectionOperation_when_opt IndexOptionDefaults = new IndexOptionDefaults { StorageEngine = new BsonDocument("x", 1) }, MaxDocuments = 10, MaxSize = 11, - NoPadding = true, StorageEngine = storageEngine, - UsePowerOf2Sizes = true, ValidationAction = DocumentValidationAction.Warn, ValidationLevel = DocumentValidationLevel.Off }; @@ -532,9 +526,7 @@ public void CreateCollection_should_execute_a_CreateCollectionOperation_when_opt op.IndexOptionDefaults.ToBsonDocument().Should().Be(options.IndexOptionDefaults.ToBsonDocument()); op.MaxDocuments.Should().Be(options.MaxDocuments); op.MaxSize.Should().Be(options.MaxSize); - op.NoPadding.Should().Be(options.NoPadding); op.StorageEngine.Should().Be(storageEngine); - op.UsePowerOf2Sizes.Should().Be(options.UsePowerOf2Sizes); op.ValidationAction.Should().Be(options.ValidationAction); op.ValidationLevel.Should().Be(options.ValidationLevel); op.Validator.Should().BeNull(); @@ -586,9 +578,7 @@ public void CreateCollection_should_execute_a_CreateCollectionOperation_when_opt op.IndexOptionDefaults.Should().BeNull(); op.MaxDocuments.Should().NotHaveValue(); op.MaxSize.Should().NotHaveValue(); - op.NoPadding.Should().NotHaveValue(); op.StorageEngine.Should().BeNull(); - op.UsePowerOf2Sizes.Should().NotHaveValue(); op.ValidationAction.Should().BeNull(); op.ValidationLevel.Should().BeNull(); op.Validator.Should().BeNull(); diff --git a/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs b/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs index 58fdbdfa2c3..c0f7ef4b1d8 100644 --- a/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs +++ b/tests/MongoDB.Driver.Tests/RetryableWritesTests.cs @@ -96,26 +96,6 @@ public void Retryable_write_errorlabel_should_not_be_added_with_retryWrites_fals } } - [Fact] - public void Retryable_write_operation_should_throw_custom_exception_on_servers_using_mmapv1() - { - RequireSupportForRetryableWrites(); - RequireServer.Check().ClusterType(ClusterType.ReplicaSet).StorageEngine("mmapv1"); - - using (var client = GetClient()) - using (var session = client.StartSession()) - { - var database = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName); - var collection = database.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); - var document = new BsonDocument("x", 1); - var exception = Record.Exception(() => collection.InsertOne(document)); - - exception.Message.Should().Contain( - "This MongoDB deployment does not support retryable writes. " + - "Please add retryWrites=false to your connection string."); - } - } - [Fact] public void TxnNumber_should_be_included_with_FindOneAndDelete() { diff --git a/tests/MongoDB.Driver.Tests/Specifications/retryable-writes/prose-tests/MMapV1Tests.cs b/tests/MongoDB.Driver.Tests/Specifications/retryable-writes/prose-tests/MMapV1Tests.cs deleted file mode 100644 index 3e25789963d..00000000000 --- a/tests/MongoDB.Driver.Tests/Specifications/retryable-writes/prose-tests/MMapV1Tests.cs +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright 2020-present 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. -*/ - -using System; -using FluentAssertions; -using MongoDB.Bson; -using MongoDB.Driver.Core.Clusters; -using MongoDB.Driver.Core.TestHelpers.Logging; -using MongoDB.Driver.Core.TestHelpers.XunitExtensions; -using MongoDB.TestHelpers.XunitExtensions; -using Xunit; -using Xunit.Abstractions; - -namespace MongoDB.Driver.Tests.Specifications.retryable_writes.prose_tests -{ - [Trait("Category", "Integration")] - public class MMapV1Tests : LoggableTestClass - { - public MMapV1Tests(ITestOutputHelper output) : base(output) - { - } - - [Theory] - [ParameterAttributeData] - public void Write_operation_should_throw_when_retry_writes_is_true_and_storage_engine_is_MMMAPv1( - [Values(false, true)] bool async) - { - RequireServer.Check() - .ClusterType(ClusterType.ReplicaSet) - .StorageEngine("mmapv1"); - - using (var client = CreateIMongoClient()) - { - var database = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName); - var collection = database.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); - database.DropCollection(collection.CollectionNamespace.CollectionName); - - var document = new BsonDocument("_id", 1); - Exception exception; - if (async) - { - exception = Record.Exception(() => collection.InsertOneAsync(document).GetAwaiter().GetResult()); - } - else - { - exception = Record.Exception(() => collection.InsertOne(document)); - } - - var e = exception.Should().BeOfType().Subject; - e.Message.Should().Be("This MongoDB deployment does not support retryable writes. Please add retryWrites=false to your connection string."); - } - } - - // private methods - private IMongoClient CreateIMongoClient() => - DriverTestConfiguration.CreateMongoClient(s => - { - s.RetryWrites = true; - s.LoggingSettings = LoggingSettings; - }); - } -} diff --git a/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs b/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs index df7b1b25269..806e0c2115c 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/server-selection/ServerSelectionTestHelpers.cs @@ -127,9 +127,9 @@ private static ServerDescription BuildServerDescription( var lastWriteTimestamp = serverData.lastWrite != null ? BsonUtils.ToDateTimeFromMillisecondsSinceEpoch(serverData.lastWrite.lastWriteDate) : utcNow; var lastUpdateTimestamp = serverData.lastUpdateTime != null ? BsonUtils.ToDateTimeFromMillisecondsSinceEpoch(serverData.lastUpdateTime.Value) : utcNow; - var maxWireVersion = serverData.maxWireVersion ?? 7; + var maxWireVersion = serverData.maxWireVersion ?? 8; var wireVersionRange = new Range(0, maxWireVersion); - var serverVersion = new SemanticVersion(4, 0, 0); + var serverVersion = new SemanticVersion(4, 2, 0); var serverId = new ServerId(clusterId, endPoint); return new ServerDescription(