diff --git a/test/functional/unit-sdam/server_selection/spec.test.js b/test/functional/unit-sdam/server_selection/spec.test.js index 617c631f60e..375d68bff70 100644 --- a/test/functional/unit-sdam/server_selection/spec.test.js +++ b/test/functional/unit-sdam/server_selection/spec.test.js @@ -111,7 +111,6 @@ function collectStalenessTests(specDir) { return result; }); }); - return tests; } diff --git a/test/spec/max-staleness/README.rst b/test/spec/max-staleness/README.rst index b6d6f2c9781..9cf945c85e6 100644 --- a/test/spec/max-staleness/README.rst +++ b/test/spec/max-staleness/README.rst @@ -61,9 +61,9 @@ Each test specifies that it expects an error, or specifies two sets of servers: tests pass or fail deterministically. If the file contains ``error: true``, drivers MUST test that they throw an -error during server selection, due to an invalid read preference or -incompatible wire versions. For other files, drivers MUST test that they -correctly select the set of servers in ``in_latency_window``. +error during server selection due to an invalid read preference. For other +files, drivers MUST test that they correctly select the set of servers in +``in_latency_window``. Drivers MAY also test that before filtration by latency, they select the specified set of "suitable" servers. diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json b/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json index 1e3dd0bfd94..5afebbbdcb2 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json @@ -7,7 +7,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -37,7 +37,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -49,7 +49,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -63,7 +63,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml index ca4c83d6333..5f9750ef7be 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml @@ -8,14 +8,14 @@ topology_description: type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: Nearest diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/Incompatible.json b/test/spec/max-staleness/ReplicaSetNoPrimary/Incompatible.json deleted file mode 100644 index 7f9fa764c7c..00000000000 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Incompatible.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "topology_description": { - "type": "ReplicaSetNoPrimary", - "servers": [ - { - "address": "a:27017", - "type": "RSSecondary", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 5, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "2" - } - } - }, - { - "address": "b:27017", - "type": "RSSecondary", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 4, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "1" - } - } - } - ] - }, - "read_preference": { - "mode": "Nearest", - "maxStalenessSeconds": 120 - }, - "error": true -} diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/Incompatible.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/Incompatible.yml deleted file mode 100644 index 74032747ece..00000000000 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Incompatible.yml +++ /dev/null @@ -1,25 +0,0 @@ -# During server selection, clients (drivers or mongos) MUST raise an error if -# maxStalenessSeconds is defined and not -1 and any server's ``maxWireVersion`` -# is less than 5 (`SERVER-23893`_). ---- -topology_description: - type: ReplicaSetNoPrimary - servers: - - &1 - address: a:27017 - type: RSSecondary - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 5 - lastWrite: {lastWriteDate: {$numberLong: "2"}} - - &2 - address: b:27017 - type: RSSecondary - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 4 # Incompatible. - lastWrite: {lastWriteDate: {$numberLong: "1"}} -read_preference: - mode: Nearest - maxStalenessSeconds: 120 -error: true diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json b/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json index e1abef2844b..492d8a2f625 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] } diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml index 3acc594c715..8bb42d8c621 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 1 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 - &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: 5 + maxWireVersion: 6 - &3 address: c:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 25001 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.json b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.json index 53549e64317..6602561c1dc 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] } diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.yml index 6f71c92b7d6..7c3fbe5eba7 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 - &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: 5 + maxWireVersion: 6 - &3 address: c:27017 avg_rtt_ms: 5 lastUpdateTime: 0 type: RSSecondary lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json index e2768c7fb8a..16d9a673bd8 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] } diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.yml index ecf74e7e438..e162f04c93c 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 - &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: 5 + maxWireVersion: 6 - &3 address: c:27017 avg_rtt_ms: 5 lastUpdateTime: 0 type: RSSecondary lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json b/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json new file mode 100644 index 00000000000..54f318872fa --- /dev/null +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json @@ -0,0 +1,60 @@ +{ + "topology_description": { + "type": "ReplicaSetNoPrimary", + "servers": [ + { + "address": "a:27017", + "type": "PossiblePrimary", + "avg_rtt_ms": 5, + "maxWireVersion": 0 + }, + { + "address": "b:27017", + "type": "Unknown", + "avg_rtt_ms": 5, + "maxWireVersion": 0 + }, + { + "address": "c:27017", + "type": "RSSecondary", + "maxWireVersion": 6, + "avg_rtt_ms": 5, + "lastWrite": { + "lastWriteDate": { + "$numberLong": "1" + } + } + } + ] + }, + "read_preference": { + "mode": "Nearest", + "maxStalenessSeconds": 120 + }, + "suitable_servers": [ + { + "address": "c:27017", + "type": "RSSecondary", + "maxWireVersion": 6, + "avg_rtt_ms": 5, + "lastWrite": { + "lastWriteDate": { + "$numberLong": "1" + } + } + } + ], + "in_latency_window": [ + { + "address": "c:27017", + "type": "RSSecondary", + "maxWireVersion": 6, + "avg_rtt_ms": 5, + "lastWrite": { + "lastWriteDate": { + "$numberLong": "1" + } + } + } + ] +} diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml new file mode 100644 index 00000000000..c1d3b502b86 --- /dev/null +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml @@ -0,0 +1,28 @@ +# Clients ignore Unknown/PossiblePrimary servers even when read preference has maxStalenessSeconds +topology_description: + type: ReplicaSetNoPrimary + servers: + - &1 + address: a:27017 + type: PossiblePrimary + avg_rtt_ms: 5 + maxWireVersion: 0 + - &2 + address: b:27017 + type: Unknown + avg_rtt_ms: 5 + maxWireVersion: 0 + - &3 + address: c:27017 + type: RSSecondary + maxWireVersion: 6 + avg_rtt_ms: 5 + lastWrite: {lastWriteDate: {$numberLong: "1"}} +read_preference: + mode: Nearest + maxStalenessSeconds: 120 +suitable_servers: +- *3 +in_latency_window: +- *3 + diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json index 8c6be6886a7..7956b8e516d 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json @@ -8,7 +8,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -39,7 +39,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -53,7 +53,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml index 6260eb85c06..b4706e55232 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml @@ -9,14 +9,14 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: PrimaryPreferred diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json index 26007c026ee..453dce6605a 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } @@ -28,7 +28,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "nyc" } @@ -58,7 +58,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } @@ -75,7 +75,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml index 19c297abe85..cd285d5fafa 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml @@ -12,7 +12,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 tags: data_center: nyc read_preference: diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.json b/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.json index 7d5eb58f4da..b383f275dc4 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.json @@ -8,7 +8,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "125002" @@ -23,7 +23,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -38,7 +38,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -53,7 +53,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -80,7 +80,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -97,7 +97,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.yml index 3d6832ff421..88c5ab549db 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.yml @@ -9,7 +9,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "2"}} tags: data_center: tokyo # No match. diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json index df0bb5d77f0..7bce7d0aa42 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json @@ -7,7 +7,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -38,7 +38,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -52,7 +52,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml index 4c6a49d0cbf..0860a568ea1 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml @@ -8,14 +8,14 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: SecondaryPreferred diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json index 1ac3ea0aed9..32c9ca770bd 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json @@ -8,7 +8,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "125002" @@ -23,7 +23,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -38,7 +38,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -53,7 +53,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -80,7 +80,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -97,7 +97,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml index f0e26742f22..5a13cc73237 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml @@ -9,7 +9,7 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "2"}} tags: data_center: tokyo # No match. diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json b/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json index cb5dc5175a9..fd84cd11931 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json @@ -7,7 +7,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 4, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml index 59e9536daf2..e37f6b20b1b 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml +++ b/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml @@ -8,14 +8,14 @@ topology_description: type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "2"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 4 # Incompatible. + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json b/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json index ed18d5837ec..35eaa9d69d6 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json @@ -7,7 +7,7 @@ "type": "RSPrimary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -37,7 +37,7 @@ "type": "RSPrimary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -49,7 +49,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -63,7 +63,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml index b5d91923151..67cc8949318 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml @@ -8,14 +8,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: Nearest diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Incompatible.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Incompatible.json deleted file mode 100644 index d27ea11202c..00000000000 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Incompatible.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "topology_description": { - "type": "ReplicaSetWithPrimary", - "servers": [ - { - "address": "a:27017", - "type": "RSPrimary", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 5, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "1" - } - } - }, - { - "address": "b:27017", - "type": "RSSecondary", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 4, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "1" - } - } - } - ] - }, - "read_preference": { - "mode": "Nearest", - "maxStalenessSeconds": 120 - }, - "error": true -} diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Incompatible.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Incompatible.yml deleted file mode 100644 index 92655268951..00000000000 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Incompatible.yml +++ /dev/null @@ -1,25 +0,0 @@ -# During server selection, clients (drivers or mongos) MUST raise an error if -# maxStalenessSeconds is defined and not -1 and any server's ``maxWireVersion`` -# is less than 5 (`SERVER-23893`_). ---- -topology_description: - type: ReplicaSetWithPrimary - servers: - - &1 - address: a:27017 - type: RSPrimary - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 5 - lastWrite: {lastWriteDate: {$numberLong: "1"}} - - &2 - address: b:27017 - type: RSSecondary - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 4 # Incompatible. - lastWrite: {lastWriteDate: {$numberLong: "1"}} -read_preference: - mode: Nearest - maxStalenessSeconds: 120 -error: true diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json b/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json index bbd8238e8a9..18450beaedd 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json @@ -13,7 +13,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] } diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml index 129310744f4..694178bbd74 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml @@ -8,7 +8,7 @@ topology_description: avg_rtt_ms: 50 # Too far. lastUpdateTime: 1 lastWrite: {lastWriteDate: {$numberLong: "2"}} - maxWireVersion: 5 + maxWireVersion: 6 - &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: 5 + maxWireVersion: 6 - &3 address: c:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 125001 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json index cb05f52aa26..b9fb407f9e8 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -39,7 +39,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -51,7 +51,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -65,7 +65,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml index 455696492d0..89cab474442 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml @@ -10,14 +10,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json index be169a3dcb6..b695e1caeb2 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml index 3b6b5adc507..c849a0eff98 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml @@ -10,14 +10,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json index 173f5742a20..9b798d37da1 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml index 2b5126d4f6a..82c8f81ae55 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml @@ -11,14 +11,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json index eee34627831..1fa7bb4dd06 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json @@ -7,7 +7,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml index 1872d3b365b..dd62017011e 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml @@ -9,14 +9,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: maxStalenessSeconds: 120 diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.json index 753fb82ca32..198be4a681d 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] } diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.yml index 76915f22b5c..96eeb4b5592 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 - &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: 5 + maxWireVersion: 6 - &3 address: c:27017 avg_rtt_ms: 5 lastUpdateTime: 0 type: RSSecondary lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json index 6233c0815aa..3ae629c898b 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "c:27017", @@ -37,7 +37,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] }, @@ -56,7 +56,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -68,7 +68,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ], "in_latency_window": [ @@ -82,7 +82,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 } ] } diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.yml index 3b249d8f3b8..3ee119c3a73 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.yml @@ -8,21 +8,21 @@ topology_description: avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 - &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: 5 + maxWireVersion: 6 - &3 address: c:27017 avg_rtt_ms: 5 lastUpdateTime: 0 type: RSSecondary lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 read_preference: mode: Nearest maxStalenessSeconds: 150 diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json index 9a1cd3bb124..675df82631b 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } @@ -28,7 +28,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "nyc" } @@ -58,7 +58,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } @@ -75,7 +75,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml index 0c2b6e3ea20..ce2c3ab3f07 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml @@ -12,7 +12,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 tags: data_center: tokyo - &2 @@ -21,7 +21,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 tags: data_center: nyc read_preference: diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json b/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json index 107ae2755e2..795b47a1115 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -39,7 +39,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -53,7 +53,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml index 8caa31ed8fd..c1594c410f8 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml @@ -9,14 +9,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: PrimaryPreferred diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.json b/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.json deleted file mode 100644 index a6681f6a130..00000000000 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "topology_description": { - "type": "ReplicaSetWithPrimary", - "servers": [ - { - "address": "a:27017", - "type": "RSPrimary", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 5, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "1" - } - } - }, - { - "address": "b:27017", - "type": "RSSecondary", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 4, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "1" - } - } - } - ] - }, - "read_preference": { - "mode": "PrimaryPreferred", - "maxStalenessSeconds": 150 - }, - "error": true -} diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.yml deleted file mode 100644 index 677a52ce9a0..00000000000 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred_incompatible.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Primary has wire version 5, secondary has 4, read preference primaryPreferred -# with maxStalenessSeconds. The client must error, even though it uses primary and -# never applies maxStalenessSeconds. Proves that the compatibility check precedes -# filtration. ---- -topology_description: - type: ReplicaSetWithPrimary - servers: - - &1 - address: a:27017 - type: RSPrimary - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 5 - lastWrite: {lastWriteDate: {$numberLong: "1"}} - - &2 - address: b:27017 - type: RSSecondary - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 4 # Too old. - lastWrite: {lastWriteDate: {$numberLong: "1"}} -read_preference: - mode: PrimaryPreferred - maxStalenessSeconds: 150 -error: true - diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json index 5f8a21f15c9..5455708a70b 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json @@ -7,7 +7,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -38,7 +38,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -52,7 +52,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml index ac61c3a994d..33c25f41297 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml @@ -8,14 +8,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1000001"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Very stale. read_preference: mode: SecondaryPreferred diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json index 09ce6d6bd0a..6670b54c892 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "125002" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -35,7 +35,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 1, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -50,7 +50,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -65,7 +65,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -92,7 +92,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -107,7 +107,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 1, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -124,7 +124,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml index c32e8c41af2..05301d21095 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml @@ -9,14 +9,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "2"}} tags: data_center: tokyo # No match. diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json index 3700c30453e..642fee1fb30 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } @@ -40,7 +40,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "nyc" } @@ -70,7 +70,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } @@ -87,7 +87,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml index eea732a8ce3..00ed08c0af5 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml @@ -12,14 +12,14 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "2"}} - maxWireVersion: 5 + maxWireVersion: 6 tags: data_center: tokyo - &3 @@ -28,7 +28,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 tags: data_center: nyc read_preference: diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json index f117159f64d..502120dce67 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json @@ -8,7 +8,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "125002" @@ -20,7 +20,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -35,7 +35,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 1, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -50,7 +50,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -65,7 +65,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -92,7 +92,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -107,7 +107,7 @@ "type": "RSSecondary", "avg_rtt_ms": 50, "lastUpdateTime": 1, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1000001" @@ -124,7 +124,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml index 3f529477a8d..50650fea844 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml @@ -9,14 +9,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 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: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "2"}} tags: data_center: tokyo # No match. diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json index b739c6141bf..6978a1807b8 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json @@ -13,7 +13,7 @@ "$numberLong": "125002" } }, - "maxWireVersion": 5 + "maxWireVersion": 6 }, { "address": "b:27017", @@ -25,7 +25,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } @@ -40,7 +40,7 @@ "$numberLong": "1" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "nyc" } @@ -70,7 +70,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } @@ -87,7 +87,7 @@ "$numberLong": "2" } }, - "maxWireVersion": 5, + "maxWireVersion": 6, "tags": { "data_center": "tokyo" } diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml index e15450b58e3..b48ae682bd5 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml @@ -12,14 +12,14 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "125002"}} - maxWireVersion: 5 + maxWireVersion: 6 - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "2"}} - maxWireVersion: 5 + maxWireVersion: 6 tags: data_center: tokyo - &3 @@ -28,7 +28,7 @@ topology_description: avg_rtt_ms: 5 lastUpdateTime: 0 lastWrite: {lastWriteDate: {$numberLong: "1"}} # Too stale. - maxWireVersion: 5 + maxWireVersion: 6 tags: data_center: nyc read_preference: diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json b/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json index f17aa93a3fb..e1e4a7ffb73 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json @@ -7,7 +7,7 @@ "type": "RSPrimary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "2" @@ -19,7 +19,7 @@ "type": "RSSecondary", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 4, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml index 99d3a66f356..1c2caf8e00e 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml +++ b/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml @@ -8,14 +8,14 @@ topology_description: type: RSPrimary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "2"}} - &2 address: b:27017 type: RSSecondary avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 4 # Incompatible. + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/test/spec/max-staleness/Sharded/Incompatible.json b/test/spec/max-staleness/Sharded/Incompatible.json deleted file mode 100644 index c261383f4a6..00000000000 --- a/test/spec/max-staleness/Sharded/Incompatible.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "topology_description": { - "type": "Sharded", - "servers": [ - { - "address": "a:27017", - "type": "Mongos", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 5, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "1" - } - } - }, - { - "address": "b:27017", - "type": "Mongos", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 4, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "1" - } - } - } - ] - }, - "read_preference": { - "mode": "Nearest", - "maxStalenessSeconds": 120 - }, - "error": true -} diff --git a/test/spec/max-staleness/Sharded/Incompatible.yml b/test/spec/max-staleness/Sharded/Incompatible.yml deleted file mode 100644 index 76581362718..00000000000 --- a/test/spec/max-staleness/Sharded/Incompatible.yml +++ /dev/null @@ -1,25 +0,0 @@ -# During server selection, clients (drivers or mongos) MUST raise an error if -# maxStalenessSeconds is defined and not -1 and any server's ``maxWireVersion`` -# is less than 5 (`SERVER-23893`_). ---- -topology_description: - type: Sharded - servers: - - &1 - address: a:27017 - type: Mongos - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 5 - lastWrite: {lastWriteDate: {$numberLong: "1"}} - - &2 - address: b:27017 - type: Mongos - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 4 # Incompatible. - lastWrite: {lastWriteDate: {$numberLong: "1"}} -read_preference: - mode: Nearest - maxStalenessSeconds: 120 -error: true diff --git a/test/spec/max-staleness/Sharded/SmallMaxStaleness.json b/test/spec/max-staleness/Sharded/SmallMaxStaleness.json index 27b9f1c12fd..91d89720d10 100644 --- a/test/spec/max-staleness/Sharded/SmallMaxStaleness.json +++ b/test/spec/max-staleness/Sharded/SmallMaxStaleness.json @@ -8,7 +8,7 @@ "type": "Mongos", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -20,7 +20,7 @@ "type": "Mongos", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -39,7 +39,7 @@ "type": "Mongos", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -51,7 +51,7 @@ "type": "Mongos", "avg_rtt_ms": 50, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -65,7 +65,7 @@ "type": "Mongos", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/Sharded/SmallMaxStaleness.yml b/test/spec/max-staleness/Sharded/SmallMaxStaleness.yml index 2a3d8e490d7..5ee1e079df3 100644 --- a/test/spec/max-staleness/Sharded/SmallMaxStaleness.yml +++ b/test/spec/max-staleness/Sharded/SmallMaxStaleness.yml @@ -9,14 +9,14 @@ topology_description: type: Mongos avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} - &2 address: b:27017 type: Mongos avg_rtt_ms: 50 # Too far. lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/test/spec/max-staleness/Single/Incompatible.json b/test/spec/max-staleness/Single/Incompatible.json deleted file mode 100644 index b37fec7c1ac..00000000000 --- a/test/spec/max-staleness/Single/Incompatible.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "topology_description": { - "type": "Single", - "servers": [ - { - "address": "a:27017", - "type": "Standalone", - "avg_rtt_ms": 5, - "lastUpdateTime": 0, - "maxWireVersion": 4, - "lastWrite": { - "lastWriteDate": { - "$numberLong": "1" - } - } - } - ] - }, - "read_preference": { - "mode": "Nearest", - "maxStalenessSeconds": 120 - }, - "error": true -} diff --git a/test/spec/max-staleness/Single/Incompatible.yml b/test/spec/max-staleness/Single/Incompatible.yml deleted file mode 100644 index d85d9714d94..00000000000 --- a/test/spec/max-staleness/Single/Incompatible.yml +++ /dev/null @@ -1,18 +0,0 @@ -# During server selection, clients (drivers or mongos) MUST raise an error if -# maxStalenessSeconds is defined and not -1 and any server's ``maxWireVersion`` -# is less than 5 (`SERVER-23893`_). ---- -topology_description: - type: Single - servers: - - &1 - address: a:27017 - type: Standalone - avg_rtt_ms: 5 - lastUpdateTime: 0 - maxWireVersion: 4 # Incompatible. - lastWrite: {lastWriteDate: {$numberLong: "1"}} -read_preference: - mode: Nearest - maxStalenessSeconds: 120 -error: true diff --git a/test/spec/max-staleness/Single/SmallMaxStaleness.json b/test/spec/max-staleness/Single/SmallMaxStaleness.json index c6b10231b87..b8d2db24be7 100644 --- a/test/spec/max-staleness/Single/SmallMaxStaleness.json +++ b/test/spec/max-staleness/Single/SmallMaxStaleness.json @@ -8,7 +8,7 @@ "type": "Standalone", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -27,7 +27,7 @@ "type": "Standalone", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" @@ -41,7 +41,7 @@ "type": "Standalone", "avg_rtt_ms": 5, "lastUpdateTime": 0, - "maxWireVersion": 5, + "maxWireVersion": 6, "lastWrite": { "lastWriteDate": { "$numberLong": "1" diff --git a/test/spec/max-staleness/Single/SmallMaxStaleness.yml b/test/spec/max-staleness/Single/SmallMaxStaleness.yml index c4285092b2d..40f63a82a5f 100644 --- a/test/spec/max-staleness/Single/SmallMaxStaleness.yml +++ b/test/spec/max-staleness/Single/SmallMaxStaleness.yml @@ -9,7 +9,7 @@ topology_description: type: Standalone avg_rtt_ms: 5 lastUpdateTime: 0 - maxWireVersion: 5 + maxWireVersion: 6 lastWrite: {lastWriteDate: {$numberLong: "1"}} read_preference: mode: Nearest diff --git a/test/spec/max-staleness/Unknown/SmallMaxStaleness.json b/test/spec/max-staleness/Unknown/SmallMaxStaleness.json index bf6174b8e4d..8d69f46a1ea 100644 --- a/test/spec/max-staleness/Unknown/SmallMaxStaleness.json +++ b/test/spec/max-staleness/Unknown/SmallMaxStaleness.json @@ -6,7 +6,7 @@ { "address": "a:27017", "type": "Unknown", - "maxWireVersion": 5 + "maxWireVersion": 6 } ] }, diff --git a/test/spec/max-staleness/Unknown/SmallMaxStaleness.yml b/test/spec/max-staleness/Unknown/SmallMaxStaleness.yml index 3a39615ac08..59e14db3623 100644 --- a/test/spec/max-staleness/Unknown/SmallMaxStaleness.yml +++ b/test/spec/max-staleness/Unknown/SmallMaxStaleness.yml @@ -7,7 +7,7 @@ topology_description: - &1 address: a:27017 type: Unknown - maxWireVersion: 5 + maxWireVersion: 6 read_preference: mode: Nearest maxStalenessSeconds: 1