From 05a0ccdd7475d0dde64aeb8683725880fcf764a0 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 25 Jul 2024 13:07:53 +0200 Subject: [PATCH 1/3] feat(NODE-5838): remove support for server 3.6 --- .evergreen/ci_matrix_constants.js | 2 +- .evergreen/config.yml | 129 ------------------ src/cmap/auth/mongo_credentials.ts | 10 +- src/cmap/auth/mongocr.ts | 38 ------ src/cmap/wire_protocol/constants.ts | 4 +- src/mongo_client_auth_providers.ts | 10 +- test/mongodb.ts | 1 - test/spec/auth/legacy/connection-string.json | 45 +----- test/spec/auth/legacy/connection-string.yml | 32 +---- test/spec/connection-string/README.rst | 73 ---------- test/spec/connection-string/invalid-uris.yml | 2 - test/spec/connection-string/valid-auth.json | 27 +--- test/spec/connection-string/valid-auth.yml | 22 +-- .../spec/connection-string/valid-options.json | 23 +++- test/spec/connection-string/valid-options.yml | 18 ++- .../connection-string/valid-warnings.json | 15 ++ .../spec/connection-string/valid-warnings.yml | 12 ++ .../DefaultNoMaxStaleness.json | 10 +- .../DefaultNoMaxStaleness.yml | 4 +- .../ReplicaSetNoPrimary/LastUpdateTime.json | 12 +- .../ReplicaSetNoPrimary/LastUpdateTime.yml | 6 +- .../ReplicaSetNoPrimary/Nearest.json | 12 +- .../ReplicaSetNoPrimary/Nearest.yml | 6 +- .../ReplicaSetNoPrimary/Nearest2.json | 12 +- .../ReplicaSetNoPrimary/Nearest2.yml | 6 +- .../OneKnownTwoUnavailable.json | 6 +- .../OneKnownTwoUnavailable.yml | 2 +- .../ReplicaSetNoPrimary/PrimaryPreferred.json | 8 +- .../ReplicaSetNoPrimary/PrimaryPreferred.yml | 4 +- .../PrimaryPreferred_tags.json | 8 +- .../PrimaryPreferred_tags.yml | 4 +- .../ReplicaSetNoPrimary/Secondary.json | 12 +- .../ReplicaSetNoPrimary/Secondary.yml | 8 +- .../SecondaryPreferred.json | 8 +- .../SecondaryPreferred.yml | 4 +- .../SecondaryPreferred_tags.json | 12 +- .../SecondaryPreferred_tags.yml | 8 +- .../ReplicaSetNoPrimary/ZeroMaxStaleness.json | 4 +- .../ReplicaSetNoPrimary/ZeroMaxStaleness.yml | 4 +- .../DefaultNoMaxStaleness.json | 10 +- .../DefaultNoMaxStaleness.yml | 4 +- .../ReplicaSetWithPrimary/LastUpdateTime.json | 12 +- .../ReplicaSetWithPrimary/LastUpdateTime.yml | 6 +- .../ReplicaSetWithPrimary/LongHeartbeat.json | 10 +- .../ReplicaSetWithPrimary/LongHeartbeat.yml | 4 +- .../ReplicaSetWithPrimary/LongHeartbeat2.json | 4 +- .../ReplicaSetWithPrimary/LongHeartbeat2.yml | 4 +- .../MaxStalenessTooSmall.json | 4 +- .../MaxStalenessTooSmall.yml | 4 +- .../MaxStalenessWithModePrimary.json | 4 +- .../MaxStalenessWithModePrimary.yml | 4 +- .../ReplicaSetWithPrimary/Nearest.json | 12 +- .../ReplicaSetWithPrimary/Nearest.yml | 6 +- .../ReplicaSetWithPrimary/Nearest2.json | 12 +- .../ReplicaSetWithPrimary/Nearest2.yml | 6 +- .../ReplicaSetWithPrimary/Nearest_tags.json | 8 +- .../ReplicaSetWithPrimary/Nearest_tags.yml | 4 +- .../PrimaryPreferred.json | 8 +- .../PrimaryPreferred.yml | 4 +- .../SecondaryPreferred.json | 8 +- .../SecondaryPreferred.yml | 4 +- .../SecondaryPreferred_tags.json | 16 +-- .../SecondaryPreferred_tags.yml | 10 +- .../SecondaryPreferred_tags2.json | 10 +- .../SecondaryPreferred_tags2.yml | 6 +- .../ReplicaSetWithPrimary/Secondary_tags.json | 16 +-- .../ReplicaSetWithPrimary/Secondary_tags.yml | 10 +- .../Secondary_tags2.json | 10 +- .../ReplicaSetWithPrimary/Secondary_tags2.yml | 6 +- .../ZeroMaxStaleness.json | 4 +- .../ZeroMaxStaleness.yml | 4 +- .../Sharded/SmallMaxStaleness.json | 10 +- .../Sharded/SmallMaxStaleness.yml | 4 +- .../Single/SmallMaxStaleness.json | 6 +- .../Single/SmallMaxStaleness.yml | 2 +- .../Unknown/SmallMaxStaleness.json | 2 +- .../Unknown/SmallMaxStaleness.yml | 2 +- .../monitoring/discovered_standalone.json | 2 +- .../monitoring/discovered_standalone.yml | 2 +- .../replica_set_with_no_primary.json | 2 +- .../replica_set_with_no_primary.yml | 2 +- .../monitoring/replica_set_with_primary.json | 2 +- .../monitoring/replica_set_with_primary.yml | 2 +- .../monitoring/replica_set_with_removal.json | 2 +- .../monitoring/replica_set_with_removal.yml | 2 +- .../monitoring/required_replica_set.json | 2 +- .../monitoring/required_replica_set.yml | 2 +- .../monitoring/standalone.json | 2 +- .../monitoring/standalone.yml | 2 +- ...ne_suppress_equal_description_changes.json | 4 +- ...one_suppress_equal_description_changes.yml | 4 +- .../rs/compatible.json | 2 +- .../rs/compatible.yml | 2 +- .../rs/compatible_unknown.json | 2 +- .../rs/compatible_unknown.yml | 2 +- .../rs/discover_arbiters.json | 2 +- .../rs/discover_arbiters.yml | 2 +- .../rs/discover_arbiters_replicaset.json | 2 +- .../rs/discover_arbiters_replicaset.yml | 2 +- .../rs/discover_ghost.json | 2 +- .../rs/discover_ghost.yml | 2 +- .../rs/discover_ghost_replicaset.json | 2 +- .../rs/discover_ghost_replicaset.yml | 2 +- .../rs/discover_hidden.json | 2 +- .../rs/discover_hidden.yml | 2 +- .../rs/discover_hidden_replicaset.json | 2 +- .../rs/discover_hidden_replicaset.yml | 2 +- .../rs/discover_passives.json | 4 +- .../rs/discover_passives.yml | 4 +- .../rs/discover_passives_replicaset.json | 4 +- .../rs/discover_passives_replicaset.yml | 4 +- .../rs/discover_primary.json | 2 +- .../rs/discover_primary.yml | 2 +- .../rs/discover_primary_replicaset.json | 2 +- .../rs/discover_primary_replicaset.yml | 2 +- .../rs/discover_rsother.json | 2 +- .../rs/discover_rsother.yml | 2 +- .../rs/discover_rsother_replicaset.json | 4 +- .../rs/discover_rsother_replicaset.yml | 4 +- .../rs/discover_secondary.json | 2 +- .../rs/discover_secondary.yml | 2 +- .../rs/discover_secondary_replicaset.json | 2 +- .../rs/discover_secondary_replicaset.yml | 2 +- .../rs/discovery.json | 8 +- .../rs/discovery.yml | 8 +- .../rs/equal_electionids.json | 4 +- .../rs/equal_electionids.yml | 4 +- .../rs/hosts_differ_from_seeds.json | 2 +- .../rs/hosts_differ_from_seeds.yml | 2 +- .../rs/incompatible_arbiter.json | 2 +- .../rs/incompatible_arbiter.yml | 2 +- .../rs/incompatible_ghost.json | 2 +- .../rs/incompatible_ghost.yml | 2 +- .../rs/incompatible_other.json | 2 +- .../rs/incompatible_other.yml | 2 +- .../rs/ls_timeout.json | 12 +- .../rs/ls_timeout.yml | 12 +- .../rs/member_reconfig.json | 4 +- .../rs/member_reconfig.yml | 4 +- .../rs/member_standalone.json | 4 +- .../rs/member_standalone.yml | 4 +- .../rs/new_primary.json | 4 +- .../rs/new_primary.yml | 4 +- .../rs/new_primary_new_electionid.json | 6 +- .../rs/new_primary_new_electionid.yml | 6 +- .../rs/new_primary_new_setversion.json | 6 +- .../rs/new_primary_new_setversion.yml | 6 +- .../rs/new_primary_wrong_set_name.json | 4 +- .../rs/new_primary_wrong_set_name.yml | 4 +- .../rs/non_rs_member.json | 2 +- .../rs/non_rs_member.yml | 2 +- .../rs/normalize_case.json | 2 +- .../rs/normalize_case.yml | 2 +- .../rs/normalize_case_me.json | 4 +- .../rs/normalize_case_me.yml | 4 +- .../rs/null_election_id-pre-6.0.json | 8 +- .../rs/null_election_id-pre-6.0.yml | 8 +- .../rs/primary_becomes_ghost.json | 4 +- .../rs/primary_becomes_ghost.yml | 4 +- .../rs/primary_becomes_mongos.json | 4 +- .../rs/primary_becomes_mongos.yml | 4 +- .../rs/primary_becomes_standalone.json | 4 +- .../rs/primary_becomes_standalone.yml | 4 +- .../rs/primary_changes_set_name.json | 4 +- .../rs/primary_changes_set_name.yml | 4 +- .../rs/primary_disconnect.json | 2 +- .../rs/primary_disconnect.yml | 2 +- .../rs/primary_disconnect_electionid.json | 10 +- .../rs/primary_disconnect_electionid.yml | 10 +- .../rs/primary_disconnect_setversion.json | 10 +- .../rs/primary_disconnect_setversion.yml | 10 +- ...int_from_secondary_with_mismatched_me.json | 4 +- ...hint_from_secondary_with_mismatched_me.yml | 4 +- .../rs/primary_mismatched_me.json | 2 +- .../rs/primary_mismatched_me.yml | 2 +- .../rs/primary_reports_new_member.json | 8 +- .../rs/primary_reports_new_member.yml | 8 +- .../primary_to_no_primary_mismatched_me.json | 4 +- .../primary_to_no_primary_mismatched_me.yml | 4 +- .../rs/primary_wrong_set_name.json | 2 +- .../rs/primary_wrong_set_name.yml | 2 +- .../rs/repeated.json | 8 +- .../rs/repeated.yml | 8 +- .../rs/replicaset_rsnp.json | 2 +- .../rs/replicaset_rsnp.yml | 2 +- .../rs/response_from_removed.json | 4 +- .../rs/response_from_removed.yml | 4 +- .../rs/sec_not_auth.json | 4 +- .../rs/sec_not_auth.yml | 4 +- .../rs/secondary_ignore_ok_0-pre-6.0.json | 6 +- .../rs/secondary_ignore_ok_0-pre-6.0.yml | 6 +- .../rs/secondary_ignore_ok_0.json | 6 +- .../rs/secondary_ignore_ok_0.yml | 6 +- .../rs/secondary_mismatched_me.json | 2 +- .../rs/secondary_mismatched_me.yml | 2 +- .../rs/secondary_wrong_set_name.json | 2 +- .../rs/secondary_wrong_set_name.yml | 2 +- ...secondary_wrong_set_name_with_primary.json | 4 +- .../secondary_wrong_set_name_with_primary.yml | 4 +- ...setversion_without_electionid-pre-6.0.json | 4 +- .../setversion_without_electionid-pre-6.0.yml | 4 +- .../rs/stepdown_change_set_name.json | 4 +- .../rs/stepdown_change_set_name.yml | 4 +- .../rs/too_new.json | 2 +- .../rs/too_new.yml | 2 +- .../rs/unexpected_mongos.json | 2 +- .../rs/unexpected_mongos.yml | 2 +- ...setversion_without_electionid-pre-6.0.json | 6 +- ..._setversion_without_electionid-pre-6.0.yml | 6 +- .../rs/wrong_set_name.json | 2 +- .../rs/wrong_set_name.yml | 2 +- .../sharded/compatible.json | 2 +- .../sharded/compatible.yml | 2 +- .../sharded/discover_single_mongos.json | 2 +- .../sharded/discover_single_mongos.yml | 2 +- .../sharded/ls_timeout_mongos.json | 8 +- .../sharded/ls_timeout_mongos.yml | 8 +- .../sharded/mongos_disconnect.json | 6 +- .../sharded/mongos_disconnect.yml | 6 +- .../sharded/multiple_mongoses.json | 4 +- .../sharded/multiple_mongoses.yml | 4 +- .../sharded/non_mongos_removed.json | 4 +- .../sharded/non_mongos_removed.yml | 4 +- .../sharded/too_old.json | 2 +- .../sharded/too_old.yml | 2 +- .../single/compatible.json | 2 +- .../single/compatible.yml | 2 +- .../single/direct_connection_external_ip.json | 2 +- .../single/direct_connection_external_ip.yml | 2 +- .../single/direct_connection_mongos.json | 2 +- .../single/direct_connection_mongos.yml | 2 +- .../single/direct_connection_replicaset.json | 2 +- .../single/direct_connection_replicaset.yml | 2 +- .../single/direct_connection_rsarbiter.json | 2 +- .../single/direct_connection_rsarbiter.yml | 2 +- .../single/direct_connection_rsprimary.json | 2 +- .../single/direct_connection_rsprimary.yml | 2 +- .../single/direct_connection_rssecondary.json | 2 +- .../single/direct_connection_rssecondary.yml | 2 +- .../single/direct_connection_standalone.json | 2 +- .../single/direct_connection_standalone.yml | 2 +- .../direct_connection_wrong_set_name.json | 4 +- .../direct_connection_wrong_set_name.yml | 4 +- .../single/discover_standalone.json | 2 +- .../single/discover_standalone.yml | 2 +- .../single/ls_timeout_standalone.json | 2 +- .../single/ls_timeout_standalone.yml | 2 +- .../single/not_ok_response.json | 4 +- .../single/not_ok_response.yml | 4 +- .../single/standalone_removed.json | 2 +- .../single/standalone_removed.yml | 2 +- .../single/standalone_using_legacy_hello.json | 2 +- .../single/standalone_using_legacy_hello.yml | 2 +- .../single/too_old_then_upgraded.json | 4 +- .../single/too_old_then_upgraded.yml | 4 +- test/tools/mongodb-mock/index.js | 6 +- .../assorted/server_selection_spec_helper.js | 2 +- .../unit/cmap/wire_protocol/constants.test.ts | 8 +- test/unit/connection_string.spec.test.ts | 3 +- 259 files changed, 616 insertions(+), 906 deletions(-) delete mode 100644 src/cmap/auth/mongocr.ts delete mode 100644 test/spec/connection-string/README.rst diff --git a/.evergreen/ci_matrix_constants.js b/.evergreen/ci_matrix_constants.js index 42e1e2aa2f..bb53b78a76 100644 --- a/.evergreen/ci_matrix_constants.js +++ b/.evergreen/ci_matrix_constants.js @@ -1,4 +1,4 @@ -const MONGODB_VERSIONS = ['latest', 'rapid', '8.0', '7.0', '6.0', '5.0', '4.4', '4.2', '4.0', '3.6']; +const MONGODB_VERSIONS = ['latest', 'rapid', '8.0', '7.0', '6.0', '5.0', '4.4', '4.2', '4.0']; const versions = [ { codeName: 'gallium', versionNumber: 16, npmVersion: 9 }, { codeName: 'hydrogen', versionNumber: 18, npmVersion: 'latest' }, diff --git a/.evergreen/config.yml b/.evergreen/config.yml index f5fa4fabfc..6fec13aab8 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1760,57 +1760,6 @@ tasks: - func: bootstrap mongo-orchestration - func: bootstrap kms servers - func: run tests - - name: test-3.6-server - tags: - - '3.6' - - server - commands: - - command: expansions.update - type: setup - params: - updates: - - {key: NPM_VERSION, value: '9'} - - {key: VERSION, value: '3.6'} - - {key: TOPOLOGY, value: server} - - {key: AUTH, value: auth} - - func: install dependencies - - func: bootstrap mongo-orchestration - - func: bootstrap kms servers - - func: run tests - - name: test-3.6-replica_set - tags: - - '3.6' - - replica_set - commands: - - command: expansions.update - type: setup - params: - updates: - - {key: NPM_VERSION, value: '9'} - - {key: VERSION, value: '3.6'} - - {key: TOPOLOGY, value: replica_set} - - {key: AUTH, value: auth} - - func: install dependencies - - func: bootstrap mongo-orchestration - - func: bootstrap kms servers - - func: run tests - - name: test-3.6-sharded_cluster - tags: - - '3.6' - - sharded_cluster - commands: - - command: expansions.update - type: setup - params: - updates: - - {key: NPM_VERSION, value: '9'} - - {key: VERSION, value: '3.6'} - - {key: TOPOLOGY, value: sharded_cluster} - - {key: AUTH, value: auth} - - func: install dependencies - - func: bootstrap mongo-orchestration - - func: bootstrap kms servers - - func: run tests - name: test-latest-server-v1-api tags: - latest @@ -4178,60 +4127,6 @@ tasks: - func: bootstrap mongo-orchestration - func: bootstrap kms servers - func: run tests - - name: test-3.6-server-noauth - tags: - - '3.6' - - server - - noauth - commands: - - command: expansions.update - type: setup - params: - updates: - - {key: NPM_VERSION, value: '9'} - - {key: VERSION, value: '3.6'} - - {key: TOPOLOGY, value: server} - - {key: AUTH, value: noauth} - - func: install dependencies - - func: bootstrap mongo-orchestration - - func: bootstrap kms servers - - func: run tests - - name: test-3.6-replica_set-noauth - tags: - - '3.6' - - replica_set - - noauth - commands: - - command: expansions.update - type: setup - params: - updates: - - {key: NPM_VERSION, value: '9'} - - {key: VERSION, value: '3.6'} - - {key: TOPOLOGY, value: replica_set} - - {key: AUTH, value: noauth} - - func: install dependencies - - func: bootstrap mongo-orchestration - - func: bootstrap kms servers - - func: run tests - - name: test-3.6-sharded_cluster-noauth - tags: - - '3.6' - - sharded_cluster - - noauth - commands: - - command: expansions.update - type: setup - params: - updates: - - {key: NPM_VERSION, value: '9'} - - {key: VERSION, value: '3.6'} - - {key: TOPOLOGY, value: sharded_cluster} - - {key: AUTH, value: noauth} - - func: install dependencies - - func: bootstrap mongo-orchestration - - func: bootstrap kms servers - - func: run tests - name: test-lambda-example tags: - latest @@ -4676,9 +4571,6 @@ buildvariants: - test-4.0-server - test-4.0-replica_set - test-4.0-sharded_cluster - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - test-latest-server-v1-api - test-x509-authentication - test-atlas-connectivity @@ -4735,9 +4627,6 @@ buildvariants: - test-4.0-server - test-4.0-replica_set - test-4.0-sharded_cluster - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - test-latest-server-v1-api - test-x509-authentication - test-atlas-connectivity @@ -4794,9 +4683,6 @@ buildvariants: - test-4.0-server - test-4.0-replica_set - test-4.0-sharded_cluster - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - test-latest-server-v1-api - test-x509-authentication - test-atlas-connectivity @@ -4852,9 +4738,6 @@ buildvariants: - test-4.0-server - test-4.0-replica_set - test-4.0-sharded_cluster - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - test-latest-server-v1-api - test-x509-authentication - test-atlas-connectivity @@ -4910,9 +4793,6 @@ buildvariants: - test-4.0-server - test-4.0-replica_set - test-4.0-sharded_cluster - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - test-latest-server-v1-api - test-socks5 - test-socks5-tls @@ -4957,9 +4837,6 @@ buildvariants: - test-4.0-server - test-4.0-replica_set - test-4.0-sharded_cluster - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - test-latest-server-v1-api - test-socks5 - test-socks5-tls @@ -5004,9 +4881,6 @@ buildvariants: - test-4.0-server - test-4.0-replica_set - test-4.0-sharded_cluster - - test-3.6-server - - test-3.6-replica_set - - test-3.6-sharded_cluster - test-latest-server-v1-api - test-socks5 - test-socks5-tls @@ -5254,9 +5128,6 @@ buildvariants: - test-4.0-server-noauth - test-4.0-replica_set-noauth - test-4.0-sharded_cluster-noauth - - test-3.6-server-noauth - - test-3.6-replica_set-noauth - - test-3.6-sharded_cluster-noauth - name: rhel8-test-lambda display_name: AWS Lambda handler tests run_on: rhel80-large diff --git a/src/cmap/auth/mongo_credentials.ts b/src/cmap/auth/mongo_credentials.ts index 3438886eff..b97bb2def0 100644 --- a/src/cmap/auth/mongo_credentials.ts +++ b/src/cmap/auth/mongo_credentials.ts @@ -20,15 +20,10 @@ function getDefaultAuthMechanism(hello: Document | null): AuthMechanism { ? AuthMechanism.MONGODB_SCRAM_SHA256 : AuthMechanism.MONGODB_SCRAM_SHA1; } - - // Fallback to legacy selection method. If wire version >= 3, use scram-sha-1 - if (hello.maxWireVersion >= 3) { - return AuthMechanism.MONGODB_SCRAM_SHA1; - } } - // Default for wireprotocol < 3 - return AuthMechanism.MONGODB_CR; + // Default auth mechanism for 4.0 and higher. + return AuthMechanism.MONGODB_SCRAM_SHA256; } const ALLOWED_ENVIRONMENT_NAMES: AuthMechanismProperties['ENVIRONMENT'][] = [ @@ -173,7 +168,6 @@ export class MongoCredentials { validate(): void { if ( (this.mechanism === AuthMechanism.MONGODB_GSSAPI || - this.mechanism === AuthMechanism.MONGODB_CR || this.mechanism === AuthMechanism.MONGODB_PLAIN || this.mechanism === AuthMechanism.MONGODB_SCRAM_SHA1 || this.mechanism === AuthMechanism.MONGODB_SCRAM_SHA256) && diff --git a/src/cmap/auth/mongocr.ts b/src/cmap/auth/mongocr.ts deleted file mode 100644 index acaab721e8..0000000000 --- a/src/cmap/auth/mongocr.ts +++ /dev/null @@ -1,38 +0,0 @@ -import * as crypto from 'crypto'; - -import { MongoMissingCredentialsError } from '../../error'; -import { ns } from '../../utils'; -import { type AuthContext, AuthProvider } from './auth_provider'; - -export class MongoCR extends AuthProvider { - override async auth(authContext: AuthContext): Promise { - const { connection, credentials } = authContext; - if (!credentials) { - throw new MongoMissingCredentialsError('AuthContext must provide credentials.'); - } - - const { username, password, source } = credentials; - - const { nonce } = await connection.command(ns(`${source}.$cmd`), { getnonce: 1 }, undefined); - - const hashPassword = crypto - .createHash('md5') - .update(`${username}:mongo:${password}`, 'utf8') - .digest('hex'); - - // Final key - const key = crypto - .createHash('md5') - .update(`${nonce}${username}${hashPassword}`, 'utf8') - .digest('hex'); - - const authenticateCommand = { - authenticate: 1, - user: username, - nonce, - key - }; - - await connection.command(ns(`${source}.$cmd`), authenticateCommand, undefined); - } -} diff --git a/src/cmap/wire_protocol/constants.ts b/src/cmap/wire_protocol/constants.ts index 9512993798..9e85cab13d 100644 --- a/src/cmap/wire_protocol/constants.ts +++ b/src/cmap/wire_protocol/constants.ts @@ -1,6 +1,6 @@ -export const MIN_SUPPORTED_SERVER_VERSION = '3.6'; +export const MIN_SUPPORTED_SERVER_VERSION = '4.0'; export const MAX_SUPPORTED_SERVER_VERSION = '8.0'; -export const MIN_SUPPORTED_WIRE_VERSION = 6; +export const MIN_SUPPORTED_WIRE_VERSION = 7; export const MAX_SUPPORTED_WIRE_VERSION = 25; export const MIN_SUPPORTED_QE_WIRE_VERSION = 21; export const MIN_SUPPORTED_QE_SERVER_VERSION = '7.0'; diff --git a/src/mongo_client_auth_providers.ts b/src/mongo_client_auth_providers.ts index 7b2b66698d..c23d515e17 100644 --- a/src/mongo_client_auth_providers.ts +++ b/src/mongo_client_auth_providers.ts @@ -1,7 +1,6 @@ import { type AuthProvider } from './cmap/auth/auth_provider'; import { GSSAPI } from './cmap/auth/gssapi'; import { type AuthMechanismProperties } from './cmap/auth/mongo_credentials'; -import { MongoCR } from './cmap/auth/mongocr'; import { MongoDBAWS } from './cmap/auth/mongodb_aws'; import { MongoDBOIDC, OIDC_WORKFLOWS, type Workflow } from './cmap/auth/mongodb_oidc'; import { AutomatedCallbackWorkflow } from './cmap/auth/mongodb_oidc/automated_callback_workflow'; @@ -16,7 +15,14 @@ import { MongoInvalidArgumentError } from './error'; /** @internal */ const AUTH_PROVIDERS = new Map AuthProvider>([ [AuthMechanism.MONGODB_AWS, () => new MongoDBAWS()], - [AuthMechanism.MONGODB_CR, () => new MongoCR()], + [ + AuthMechanism.MONGODB_CR, + () => { + throw new MongoInvalidArgumentError( + 'MONGODB-CR is no longer a supported auth mechanism in MongoDB 4.0+' + ); + } + ], [AuthMechanism.MONGODB_GSSAPI, () => new GSSAPI()], [AuthMechanism.MONGODB_OIDC, (workflow?: Workflow) => new MongoDBOIDC(workflow)], [AuthMechanism.MONGODB_PLAIN, () => new Plain()], diff --git a/test/mongodb.ts b/test/mongodb.ts index b84a9ac3a0..8aeb97b592 100644 --- a/test/mongodb.ts +++ b/test/mongodb.ts @@ -107,7 +107,6 @@ export * from '../src/cmap/auth/auth_provider'; export * from '../src/cmap/auth/aws_temporary_credentials'; export * from '../src/cmap/auth/gssapi'; export * from '../src/cmap/auth/mongo_credentials'; -export * from '../src/cmap/auth/mongocr'; export * from '../src/cmap/auth/mongodb_aws'; export * from '../src/cmap/auth/mongodb_oidc'; export * from '../src/cmap/auth/mongodb_oidc/azure_machine_workflow'; diff --git a/test/spec/auth/legacy/connection-string.json b/test/spec/auth/legacy/connection-string.json index 5b54e2aadd..67aafbff6e 100644 --- a/test/spec/auth/legacy/connection-string.json +++ b/test/spec/auth/legacy/connection-string.json @@ -163,47 +163,6 @@ "uri": "mongodb://localhost/?authMechanism=GSSAPI", "valid": false }, - { - "description": "should recognize the mechanism (MONGODB-CR)", - "uri": "mongodb://user:password@localhost/?authMechanism=MONGODB-CR", - "valid": true, - "credential": { - "username": "user", - "password": "password", - "source": "admin", - "mechanism": "MONGODB-CR", - "mechanism_properties": null - } - }, - { - "description": "should use the database when no authSource is specified (MONGODB-CR)", - "uri": "mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR", - "valid": true, - "credential": { - "username": "user", - "password": "password", - "source": "foo", - "mechanism": "MONGODB-CR", - "mechanism_properties": null - } - }, - { - "description": "should use the authSource when specified (MONGODB-CR)", - "uri": "mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR&authSource=bar", - "valid": true, - "credential": { - "username": "user", - "password": "password", - "source": "bar", - "mechanism": "MONGODB-CR", - "mechanism_properties": null - } - }, - { - "description": "should throw an exception if no username is supplied (MONGODB-CR)", - "uri": "mongodb://localhost/?authMechanism=MONGODB-CR", - "valid": false - }, { "description": "should recognize the mechanism (MONGODB-X509)", "uri": "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509", @@ -517,7 +476,7 @@ }, { "description": "should throw an exception if username is specified for test (MONGODB-OIDC)", - "uri": "mongodb://principalName@localhost/?authMechanism=MONGODB-OIDC&ENVIRONMENT:test", + "uri": "mongodb://principalName@localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:test", "valid": false, "credential": null }, @@ -669,4 +628,4 @@ "credential": null } ] -} \ No newline at end of file +} diff --git a/test/spec/auth/legacy/connection-string.yml b/test/spec/auth/legacy/connection-string.yml index a965113395..ded258f29d 100644 --- a/test/spec/auth/legacy/connection-string.yml +++ b/test/spec/auth/legacy/connection-string.yml @@ -116,36 +116,6 @@ tests: - description: should throw an exception if no username (GSSAPI) uri: mongodb://localhost/?authMechanism=GSSAPI valid: false -- description: should recognize the mechanism (MONGODB-CR) - uri: mongodb://user:password@localhost/?authMechanism=MONGODB-CR - valid: true - credential: - username: user - password: password - source: admin - mechanism: MONGODB-CR - mechanism_properties: -- description: should use the database when no authSource is specified (MONGODB-CR) - uri: mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR - valid: true - credential: - username: user - password: password - source: foo - mechanism: MONGODB-CR - mechanism_properties: -- description: should use the authSource when specified (MONGODB-CR) - uri: mongodb://user:password@localhost/foo?authMechanism=MONGODB-CR&authSource=bar - valid: true - credential: - username: user - password: password - source: bar - mechanism: MONGODB-CR - mechanism_properties: -- description: should throw an exception if no username is supplied (MONGODB-CR) - uri: mongodb://localhost/?authMechanism=MONGODB-CR - valid: false - description: should recognize the mechanism (MONGODB-X509) uri: mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509 valid: true @@ -375,7 +345,7 @@ tests: valid: false credential: - description: should throw an exception if username is specified for test (MONGODB-OIDC) - uri: mongodb://principalName@localhost/?authMechanism=MONGODB-OIDC&ENVIRONMENT:test + uri: mongodb://principalName@localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:test valid: false credential: - description: should throw an exception if specified environment is not supported (MONGODB-OIDC) diff --git a/test/spec/connection-string/README.rst b/test/spec/connection-string/README.rst deleted file mode 100644 index f221600b2d..0000000000 --- a/test/spec/connection-string/README.rst +++ /dev/null @@ -1,73 +0,0 @@ -======================= -Connection String Tests -======================= - -The YAML and JSON files in this directory tree are platform-independent tests -that drivers can use to prove their conformance to the Connection String Spec. - -As the spec is primarily concerned with parsing the parts of a URI, these tests -do not focus on host and option validation. Where necessary, the tests use -options known to be (un)supported by drivers to assert behavior such as issuing -a warning on repeated option keys. As such these YAML tests are in no way a -replacement for more thorough testing. However, they can provide an initial -verification of your implementation. - -Version -------- - -Files in the "specifications" repository have no version scheme. They are not -tied to a MongoDB server version. - -Format ------- - -Each YAML file contains an object with a single ``tests`` key. This key is an -array of test case objects, each of which have the following keys: - -- ``description``: A string describing the test. -- ``uri``: A string containing the URI to be parsed. -- ``valid:`` A boolean indicating if the URI should be considered valid. -- ``warning:`` A boolean indicating whether URI parsing should emit a warning - (independent of whether or not the URI is valid). -- ``hosts``: An array of host objects, each of which have the following keys: - - - ``type``: A string denoting the type of host. Possible values are "ipv4", - "ip_literal", "hostname", and "unix". Asserting the type is *optional*. - - ``host``: A string containing the parsed host. - - ``port``: An integer containing the parsed port number. -- ``auth``: An object containing the following keys: - - - ``username``: A string containing the parsed username. For auth mechanisms - that do not utilize a password, this may be the entire ``userinfo`` token - (as discussed in `RFC 2396 `_). - - ``password``: A string containing the parsed password. - - ``db``: A string containing the parsed authentication database. For legacy - implementations that support namespaces (databases and collections) this may - be the full namespace eg: ``.`` -- ``options``: An object containing key/value pairs for each parsed query string - option. - -If a test case includes a null value for one of these keys (e.g. ``auth: ~``, -``port: ~``), no assertion is necessary. This both simplifies parsing of the -test files (keys should always exist) and allows flexibility for drivers that -might substitute default values *during* parsing (e.g. omitted ``port`` could be -parsed as 27017). - -The ``valid`` and ``warning`` fields are boolean in order to keep the tests -flexible. We are not concerned with asserting the format of specific error or -warnings messages strings. - -Use as unit tests -================= - -Testing whether a URI is valid or not should simply be a matter of checking -whether URI parsing (or MongoClient construction) raises an error or exception. -Testing for emitted warnings may require more legwork (e.g. configuring a log -handler and watching for output). - -Not all drivers may be able to directly assert the hosts, auth credentials, and -options. Doing so may require exposing the driver's URI parsing component. - -The file valid-db-with-dotted-name.yml is a special case for testing drivers -that allow dotted namespaces, instead of only database names, in the Auth -Database portion of the URI. diff --git a/test/spec/connection-string/invalid-uris.yml b/test/spec/connection-string/invalid-uris.yml index 79e110c79d..dd4d4ce31c 100644 --- a/test/spec/connection-string/invalid-uris.yml +++ b/test/spec/connection-string/invalid-uris.yml @@ -249,5 +249,3 @@ tests: hosts: ~ auth: ~ options: ~ - - diff --git a/test/spec/connection-string/valid-auth.json b/test/spec/connection-string/valid-auth.json index 176a54a096..60f63f4e3f 100644 --- a/test/spec/connection-string/valid-auth.json +++ b/test/spec/connection-string/valid-auth.json @@ -220,29 +220,8 @@ "options": null }, { - "description": "Escaped user info and database (MONGODB-CR)", - "uri": "mongodb://%24am:f%3Azzb%40z%2Fz%3D@127.0.0.1/admin%3F?authMechanism=MONGODB-CR", - "valid": true, - "warning": false, - "hosts": [ - { - "type": "ipv4", - "host": "127.0.0.1", - "port": null - } - ], - "auth": { - "username": "$am", - "password": "f:zzb@z/z=", - "db": "admin?" - }, - "options": { - "authmechanism": "MONGODB-CR" - } - }, - { - "description": "Subdelimiters in user/pass don't need escaping (MONGODB-CR)", - "uri": "mongodb://!$&'()*+,;=:!$&'()*+,;=@127.0.0.1/admin?authMechanism=MONGODB-CR", + "description": "Subdelimiters in user/pass don't need escaping (PLAIN)", + "uri": "mongodb://!$&'()*+,;=:!$&'()*+,;=@127.0.0.1/admin?authMechanism=PLAIN", "valid": true, "warning": false, "hosts": [ @@ -258,7 +237,7 @@ "db": "admin" }, "options": { - "authmechanism": "MONGODB-CR" + "authmechanism": "PLAIN" } }, { diff --git a/test/spec/connection-string/valid-auth.yml b/test/spec/connection-string/valid-auth.yml index f40c748fa6..02ed287428 100644 --- a/test/spec/connection-string/valid-auth.yml +++ b/test/spec/connection-string/valid-auth.yml @@ -173,24 +173,8 @@ tests: db: "my=db" options: ~ - - description: "Escaped user info and database (MONGODB-CR)" - uri: "mongodb://%24am:f%3Azzb%40z%2Fz%3D@127.0.0.1/admin%3F?authMechanism=MONGODB-CR" - valid: true - warning: false - hosts: - - - type: "ipv4" - host: "127.0.0.1" - port: ~ - auth: - username: "$am" - password: "f:zzb@z/z=" - db: "admin?" - options: - authmechanism: "MONGODB-CR" - - - description: "Subdelimiters in user/pass don't need escaping (MONGODB-CR)" - uri: "mongodb://!$&'()*+,;=:!$&'()*+,;=@127.0.0.1/admin?authMechanism=MONGODB-CR" + description: "Subdelimiters in user/pass don't need escaping (PLAIN)" + uri: "mongodb://!$&'()*+,;=:!$&'()*+,;=@127.0.0.1/admin?authMechanism=PLAIN" valid: true warning: false hosts: @@ -203,7 +187,7 @@ tests: password: "!$&'()*+,;=" db: "admin" options: - authmechanism: "MONGODB-CR" + authmechanism: "PLAIN" - description: "Escaped username (MONGODB-X509)" uri: "mongodb://CN%3DmyName%2COU%3DmyOrgUnit%2CO%3DmyOrg%2CL%3DmyLocality%2CST%3DmyState%2CC%3DmyCountry@localhost/?authMechanism=MONGODB-X509" diff --git a/test/spec/connection-string/valid-options.json b/test/spec/connection-string/valid-options.json index 01bc2264bb..6c86172d08 100644 --- a/test/spec/connection-string/valid-options.json +++ b/test/spec/connection-string/valid-options.json @@ -2,7 +2,7 @@ "tests": [ { "description": "Option names are normalized to lowercase", - "uri": "mongodb://alice:secret@example.com/admin?AUTHMechanism=MONGODB-CR", + "uri": "mongodb://alice:secret@example.com/admin?AUTHMechanism=PLAIN", "valid": true, "warning": false, "hosts": [ @@ -18,7 +18,7 @@ "db": "admin" }, "options": { - "authmechanism": "MONGODB-CR" + "authmechanism": "PLAIN" } }, { @@ -37,6 +37,25 @@ "options": { "tls": true } + }, + { + "description": "Colon in a key value pair", + "uri": "mongodb://example.com/?authMechanism=MONGODB-OIDC&authMechanismProperties=TOKEN_RESOURCE:mongodb://test-cluster", + "valid": true, + "warning": false, + "hosts": [ + { + "type": "hostname", + "host": "example.com", + "port": null + } + ], + "auth": null, + "options": { + "authmechanismProperties": { + "TOKEN_RESOURCE": "mongodb://test-cluster" + } + } } ] } diff --git a/test/spec/connection-string/valid-options.yml b/test/spec/connection-string/valid-options.yml index 8cb0dea3a6..86523c7f39 100644 --- a/test/spec/connection-string/valid-options.yml +++ b/test/spec/connection-string/valid-options.yml @@ -1,7 +1,7 @@ tests: - description: "Option names are normalized to lowercase" - uri: "mongodb://alice:secret@example.com/admin?AUTHMechanism=MONGODB-CR" + uri: "mongodb://alice:secret@example.com/admin?AUTHMechanism=PLAIN" valid: true warning: false hosts: @@ -14,7 +14,7 @@ tests: password: "secret" db: "admin" options: - authmechanism: "MONGODB-CR" + authmechanism: "PLAIN" - description: "Missing delimiting slash between hosts and options" uri: "mongodb://example.com?tls=true" @@ -28,3 +28,17 @@ tests: auth: ~ options: tls: true + - + description: Colon in a key value pair + uri: mongodb://example.com/?authMechanism=MONGODB-OIDC&authMechanismProperties=TOKEN_RESOURCE:mongodb://test-cluster + valid: true + warning: false + hosts: + - + type: hostname + host: example.com + port: ~ + auth: ~ + options: + authmechanismProperties: + TOKEN_RESOURCE: 'mongodb://test-cluster' \ No newline at end of file diff --git a/test/spec/connection-string/valid-warnings.json b/test/spec/connection-string/valid-warnings.json index 1eacbf8fcb..f0e8288bc7 100644 --- a/test/spec/connection-string/valid-warnings.json +++ b/test/spec/connection-string/valid-warnings.json @@ -93,6 +93,21 @@ ], "auth": null, "options": null + }, + { + "description": "Comma in a key value pair causes a warning", + "uri": "mongodb://localhost?authMechanism=MONGODB-OIDC&authMechanismProperties=TOKEN_RESOURCE:mongodb://host1%2Chost2", + "valid": true, + "warning": true, + "hosts": [ + { + "type": "hostname", + "host": "localhost", + "port": null + } + ], + "auth": null, + "options": null } ] } diff --git a/test/spec/connection-string/valid-warnings.yml b/test/spec/connection-string/valid-warnings.yml index ea9cc9d1ed..bdc64c5916 100644 --- a/test/spec/connection-string/valid-warnings.yml +++ b/test/spec/connection-string/valid-warnings.yml @@ -73,3 +73,15 @@ tests: port: ~ auth: ~ options: ~ + - + description: Comma in a key value pair causes a warning + uri: mongodb://localhost?authMechanism=MONGODB-OIDC&authMechanismProperties=TOKEN_RESOURCE:mongodb://host1%2Chost2 + valid: true + warning: true + hosts: + - + type: "hostname" + host: "localhost" + port: ~ + auth: ~ + options: ~ diff --git a/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json b/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.json index 5afebbbdcb..db8b061b30 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": 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/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/DefaultNoMaxStaleness.yml index 5f9750ef7b..793aa10eaa 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json b/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json index 492d8a2f62..10b6f28786 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.json +++ b/test/spec/max-staleness/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/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/LastUpdateTime.yml index 8bb42d8c62..2016941713 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.json b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.json index 6602561c1d..38b9986500 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.json +++ b/test/spec/max-staleness/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/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest.yml index 7c3fbe5eba..783831f477 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json index 16d9a673bd..586b47ccd2 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.json +++ b/test/spec/max-staleness/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/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/Nearest2.yml index e162f04c93..867b7706a4 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json b/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json index 54f318872f..15a62090e3 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.json +++ b/test/spec/max-staleness/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/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml index c1d3b502b8..ccbec183ca 100644 --- a/test/spec/max-staleness/ReplicaSetNoPrimary/OneKnownTwoUnavailable.yml +++ b/test/spec/max-staleness/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/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.json index 7956b8e516..7c036f725c 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": 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/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred.yml index b4706e5523..c01aff6f79 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.json index 453dce6605..56fcb156bb 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": 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/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/PrimaryPreferred_tags.yml index cd285d5faf..a5df80ff36 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.json b/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.json index b383f275dc..5a4b0c8226 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": 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/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/Secondary.yml index 88c5ab549d..93e81841b4 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.json index 7bce7d0aa4..19a948e928 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": 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/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred.yml index 0860a568ea..f997882bc0 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.json index 32c9ca770b..b4633d88f3 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": 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/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/SecondaryPreferred_tags.yml index 5a13cc7323..f4a6c8f6b6 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: 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/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json b/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.json index fd84cd1193..ccb916f107 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": 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/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml b/test/spec/max-staleness/ReplicaSetNoPrimary/ZeroMaxStaleness.yml index e37f6b20b1..e6be41ca67 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json b/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.json index 35eaa9d69d..00137cf69e 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/DefaultNoMaxStaleness.yml index 67cc894931..1ea9b209c8 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json b/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json index 18450beaed..9d1db2de65 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.json +++ b/test/spec/max-staleness/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/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/LastUpdateTime.yml index 694178bbd7..e4fbe1ff7d 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.json index b9fb407f9e..b0636236cc 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat.yml index 89cab47444..1e479c32e0 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.json index b695e1caeb..76edfcb836 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/LongHeartbeat2.yml index c849a0eff9..836467bf1f 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.json index 9b798d37da..aa936e3c67 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessTooSmall.yml index 82c8f81ae5..9edd4199bf 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.json index 1fa7bb4dd0..c24752a7f1 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/MaxStalenessWithModePrimary.yml index dd62017011..92358a702d 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.json index 198be4a681..d3a9535b09 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.json +++ b/test/spec/max-staleness/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/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest.yml index 96eeb4b559..5ef6c720a5 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json index 3ae629c898..f91706e804 100644 --- a/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.json +++ b/test/spec/max-staleness/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/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest2.yml index 3ee119c3a7..7d4f706fc7 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.json index 675df82631..4ed0b9ed2e 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Nearest_tags.yml index ce2c3ab3f0..6db5d4362b 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json b/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.json index 795b47a111..7945530e6a 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/PrimaryPreferred.yml index c1594c410f..e38f33d7c1 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.json index 5455708a70..b433d6a430 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred.yml index 33c25f4129..ff35b9bdab 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.json index 6670b54c89..e594af7832 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags.yml index 05301d2109..4d17a4d7fd 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.json index 642fee1fb3..bc0953c657 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/SecondaryPreferred_tags2.yml index 00ed08c0af..82c5a799f7 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.json index 502120dce6..2817cf9225 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags.yml index 50650fea84..721cbc8a5d 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.json index 6978a1807b..7aa487a078 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/Secondary_tags2.yml index b48ae682bd..669ec5bb56 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: 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/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json b/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.json index e1e4a7ffb7..fff5609fcc 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": 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/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml b/test/spec/max-staleness/ReplicaSetWithPrimary/ZeroMaxStaleness.yml index 1c2caf8e00..18790394e7 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: 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/test/spec/max-staleness/Sharded/SmallMaxStaleness.json b/test/spec/max-staleness/Sharded/SmallMaxStaleness.json index 91d89720d1..98e05be363 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": 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/test/spec/max-staleness/Sharded/SmallMaxStaleness.yml b/test/spec/max-staleness/Sharded/SmallMaxStaleness.yml index 5ee1e079df..9d5034df1e 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: 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/test/spec/max-staleness/Single/SmallMaxStaleness.json b/test/spec/max-staleness/Single/SmallMaxStaleness.json index b8d2db24be..d948739855 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": 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/test/spec/max-staleness/Single/SmallMaxStaleness.yml b/test/spec/max-staleness/Single/SmallMaxStaleness.yml index 40f63a82a5..3cba2ae55c 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: 6 + maxWireVersion: 21 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 8d69f46a1e..0e609bcf94 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": 6 + "maxWireVersion": 21 } ] }, diff --git a/test/spec/max-staleness/Unknown/SmallMaxStaleness.yml b/test/spec/max-staleness/Unknown/SmallMaxStaleness.yml index 59e14db362..5d42063765 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: 6 + maxWireVersion: 21 read_preference: mode: Nearest maxStalenessSeconds: 1 diff --git a/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.json b/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.json index dd8f7fc51e..097203694e 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.json +++ b/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.yml b/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.yml index 5d808f2600..1de96154cc 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json index 950e32efe1..41d048729d 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json +++ b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.json @@ -19,7 +19,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.yml b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.yml index ce9cdf46e6..e5ca9cd90d 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_no_primary.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.json b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.json index 2ad94d6e6a..3ccc127d1d 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.json +++ b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.json @@ -18,7 +18,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.yml b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.yml index 2c78919063..256895bb28 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_primary.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.json b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.json index ae28faa30c..dc6fbe7e7d 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.json +++ b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.json @@ -69,7 +69,7 @@ "a:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.yml b/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.yml index 2471f47680..25c006861a 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/replica_set_with_removal.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/monitoring/required_replica_set.json b/test/spec/server-discovery-and-monitoring/monitoring/required_replica_set.json index 401c5d99c5..1f4e5c1d71 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/required_replica_set.json +++ b/test/spec/server-discovery-and-monitoring/monitoring/required_replica_set.json @@ -18,7 +18,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/monitoring/required_replica_set.yml b/test/spec/server-discovery-and-monitoring/monitoring/required_replica_set.yml index 7a060128f3..69d0500de1 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/required_replica_set.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/monitoring/standalone.json b/test/spec/server-discovery-and-monitoring/monitoring/standalone.json index 821a1525d4..f375a383ca 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/standalone.json +++ b/test/spec/server-discovery-and-monitoring/monitoring/standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/monitoring/standalone.yml b/test/spec/server-discovery-and-monitoring/monitoring/standalone.yml index d9f6bcfaf3..0c3ed64601 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/standalone.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.json b/test/spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.json index 5958e2d26c..4d046ff8ed 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.yml b/test/spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.yml index f2f83ffbac..255ec2dd43 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/standalone_suppress_equal_description_changes.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/compatible.json b/test/spec/server-discovery-and-monitoring/rs/compatible.json index 444b13e9d5..dfd5d57dfa 100644 --- a/test/spec/server-discovery-and-monitoring/rs/compatible.json +++ b/test/spec/server-discovery-and-monitoring/rs/compatible.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/test/spec/server-discovery-and-monitoring/rs/compatible.yml b/test/spec/server-discovery-and-monitoring/rs/compatible.yml index 8b5d9f456a..ce17d7e302 100644 --- a/test/spec/server-discovery-and-monitoring/rs/compatible.yml +++ b/test/spec/server-discovery-and-monitoring/rs/compatible.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/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.json b/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.json index cf92dd1ed3..95e03ea958 100644 --- a/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.json +++ b/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.yml b/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.yml index 643e849819..ed97ab31ac 100644 --- a/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.yml +++ b/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.yml @@ -12,7 +12,7 @@ phases: [ setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }], ], outcome: { diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.json b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.json index 53709b0cee..803462b156 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.yml b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.yml index 67d29eadb5..5334bc8241 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.yml @@ -16,7 +16,7 @@ phases: [ arbiters: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.json b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.json index 64fb49f4fc..e58d7c7fb4 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.yml b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.yml index c7edb52b01..882dbb0f89 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters_replicaset.yml @@ -16,7 +16,7 @@ phases: [ arbiters: ["b:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_ghost.json b/test/spec/server-discovery-and-monitoring/rs/discover_ghost.json index 2e24c83e0b..3b7fc836ec 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_ghost.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_ghost.json @@ -12,7 +12,7 @@ "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_ghost.yml b/test/spec/server-discovery-and-monitoring/rs/discover_ghost.yml index e613f684b4..7a9cbd5559 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_ghost.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_ghost.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.json b/test/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.json index cf5fe83a54..1a8457983b 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.json @@ -12,7 +12,7 @@ "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.yml b/test/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.yml index 75ec3e64a9..61ba1eab56 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_ghost_replicaset.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_hidden.json b/test/spec/server-discovery-and-monitoring/rs/discover_hidden.json index e4a90f1f9c..10bd51edeb 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_hidden.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_hidden.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_hidden.yml b/test/spec/server-discovery-and-monitoring/rs/discover_hidden.yml index 64ed1d82b9..f483255802 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_hidden.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.json b/test/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.json index 04420596f0..63cf558675 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.json @@ -18,7 +18,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.yml b/test/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.yml index 614a39d482..8d496544d2 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_hidden_replicaset.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_passives.json b/test/spec/server-discovery-and-monitoring/rs/discover_passives.json index 30258409f6..0a292c675c 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_passives.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_passives.yml b/test/spec/server-discovery-and-monitoring/rs/discover_passives.yml index 637d86d7f1..25419733cf 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_passives.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.json b/test/spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.json index 266eaa5234..c48fd47625 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.yml b/test/spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.yml index a5ced995d3..d981280a2f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_passives_replicaset.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_primary.json b/test/spec/server-discovery-and-monitoring/rs/discover_primary.json index 2d1292bbd4..04e7a4984c 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_primary.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_primary.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_primary.yml b/test/spec/server-discovery-and-monitoring/rs/discover_primary.yml index eaedf130ba..3c11e3e4f2 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_primary.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.json b/test/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.json index 54dfefba5f..3cdcfdcee2 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.yml b/test/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.yml index 7879701bb2..47831fa60a 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_primary_replicaset.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_rsother.json b/test/spec/server-discovery-and-monitoring/rs/discover_rsother.json index 4ab25667f0..9c3b8d8b7d 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_rsother.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_rsother.json @@ -17,7 +17,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_rsother.yml b/test/spec/server-discovery-and-monitoring/rs/discover_rsother.yml index d78e70c5d7..11c65863f4 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_rsother.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.json b/test/spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.json index e3958d70ad..3da9efb066 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.yml b/test/spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.yml index 19159d1efe..c25d33ab2b 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_rsother_replicaset.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_secondary.json b/test/spec/server-discovery-and-monitoring/rs/discover_secondary.json index 22325d4e03..64a1ce31e3 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_secondary.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_secondary.json @@ -17,7 +17,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_secondary.yml b/test/spec/server-discovery-and-monitoring/rs/discover_secondary.yml index 184849d3ff..83af822eda 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_secondary.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.json b/test/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.json index d903b6444d..d230f976a2 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.json @@ -17,7 +17,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.yml b/test/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.yml index c73a535f69..71229387cc 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_secondary_replicaset.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discovery.json b/test/spec/server-discovery-and-monitoring/rs/discovery.json index 50e1269223..e9deaa7587 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discovery.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/discovery.yml b/test/spec/server-discovery-and-monitoring/rs/discovery.yml index 30c82e0cef..19be04897b 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discovery.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/equal_electionids.json b/test/spec/server-discovery-and-monitoring/rs/equal_electionids.json index 17df3207fa..f1deedf9f4 100644 --- a/test/spec/server-discovery-and-monitoring/rs/equal_electionids.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/equal_electionids.yml b/test/spec/server-discovery-and-monitoring/rs/equal_electionids.yml index 48bb683d64..17e8aa2c11 100644 --- a/test/spec/server-discovery-and-monitoring/rs/equal_electionids.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json b/test/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json index 4e02304c61..085e81e266 100644 --- a/test/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json +++ b/test/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.json @@ -15,7 +15,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.yml b/test/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.yml index e97fbca05b..2ecd27ec7c 100644 --- a/test/spec/server-discovery-and-monitoring/rs/hosts_differ_from_seeds.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.json b/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.json index f0539cb337..bda18d9f6f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.json +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.yml b/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.yml index e4928f191d..2e46ff2951 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.json b/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.json index 824e953f90..9d82e31682 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.json +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.yml b/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.yml index da1db790fe..c99badf4a3 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/incompatible_other.json b/test/spec/server-discovery-and-monitoring/rs/incompatible_other.json index 6f301ef5de..149ba01142 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_other.json +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_other.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/test/spec/server-discovery-and-monitoring/rs/incompatible_other.yml b/test/spec/server-discovery-and-monitoring/rs/incompatible_other.yml index 98061c0a1f..16452e7b02 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_other.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/ls_timeout.json b/test/spec/server-discovery-and-monitoring/rs/ls_timeout.json index 96389d3b76..c68790ddfd 100644 --- a/test/spec/server-discovery-and-monitoring/rs/ls_timeout.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/ls_timeout.yml b/test/spec/server-discovery-and-monitoring/rs/ls_timeout.yml index 26679f339e..2cea00e99e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/ls_timeout.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/member_reconfig.json b/test/spec/server-discovery-and-monitoring/rs/member_reconfig.json index 0e2c2c462e..a05fed0efb 100644 --- a/test/spec/server-discovery-and-monitoring/rs/member_reconfig.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/member_reconfig.yml b/test/spec/server-discovery-and-monitoring/rs/member_reconfig.yml index 37e63bc059..a43a88d53f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/member_reconfig.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/member_standalone.json b/test/spec/server-discovery-and-monitoring/rs/member_standalone.json index 0756003a89..db100db9f3 100644 --- a/test/spec/server-discovery-and-monitoring/rs/member_standalone.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/member_standalone.yml b/test/spec/server-discovery-and-monitoring/rs/member_standalone.yml index 50c0056650..1be000ea4e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/member_standalone.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/new_primary.json b/test/spec/server-discovery-and-monitoring/rs/new_primary.json index ed1a6245f9..1a84c69c91 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/new_primary.yml b/test/spec/server-discovery-and-monitoring/rs/new_primary.yml index 736dd06c5f..f2485a1863 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.json b/test/spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.json index ccb3a41f75..509720d445 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.yml b/test/spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.yml index dfebbd8561..5641cfda95 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary_new_electionid.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.json b/test/spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.json index 415a0f66aa..96533c61ee 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.yml b/test/spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.yml index 3ebc798b61..f269797112 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary_new_setversion.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json b/test/spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json index d7b19cfe8f..774b3a5736 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.yml b/test/spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.yml index ca6303cda9..dc6df9cd8b 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary_wrong_set_name.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/non_rs_member.json b/test/spec/server-discovery-and-monitoring/rs/non_rs_member.json index 538077ef09..6bf10bd628 100644 --- a/test/spec/server-discovery-and-monitoring/rs/non_rs_member.json +++ b/test/spec/server-discovery-and-monitoring/rs/non_rs_member.json @@ -10,7 +10,7 @@ "ok": 1, "helloOk": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/non_rs_member.yml b/test/spec/server-discovery-and-monitoring/rs/non_rs_member.yml index c18b27ee3f..4e2f0b1be2 100644 --- a/test/spec/server-discovery-and-monitoring/rs/non_rs_member.yml +++ b/test/spec/server-discovery-and-monitoring/rs/non_rs_member.yml @@ -11,7 +11,7 @@ phases: [ ok: 1, helloOk: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/normalize_case.json b/test/spec/server-discovery-and-monitoring/rs/normalize_case.json index 96a944f0c3..62915495e0 100644 --- a/test/spec/server-discovery-and-monitoring/rs/normalize_case.json +++ b/test/spec/server-discovery-and-monitoring/rs/normalize_case.json @@ -21,7 +21,7 @@ "C:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/normalize_case.yml b/test/spec/server-discovery-and-monitoring/rs/normalize_case.yml index d8003ee375..a543ab72af 100644 --- a/test/spec/server-discovery-and-monitoring/rs/normalize_case.yml +++ b/test/spec/server-discovery-and-monitoring/rs/normalize_case.yml @@ -17,7 +17,7 @@ phases: [ passives: ["B:27017"], arbiters: ["C:27017"], minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/normalize_case_me.json b/test/spec/server-discovery-and-monitoring/rs/normalize_case_me.json index ab1720cefc..0d9ba6213e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/normalize_case_me.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/normalize_case_me.yml b/test/spec/server-discovery-and-monitoring/rs/normalize_case_me.yml index a0df3351a5..03ac43f314 100644 --- a/test/spec/server-discovery-and-monitoring/rs/normalize_case_me.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json b/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json index f1fa2e252e..9e7ccc6e7f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml b/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml index 7e9bd55021..63f9699f22 100644 --- a/test/spec/server-discovery-and-monitoring/rs/null_election_id-pre-6.0.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.json b/test/spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.json index 9c54b39856..e34280e88c 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.yml b/test/spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.yml index dbf5b9289d..ee0158db0d 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_becomes_ghost.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.json b/test/spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.json index ac416e57d5..79510d9399 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.yml b/test/spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.yml index 6cdb077106..251f155277 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_becomes_mongos.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.json b/test/spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.json index a64524d0ca..abcc1e2d01 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.yml b/test/spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.yml index abcc7fcfe3..9f6a0817bf 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_becomes_standalone.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_changes_set_name.json b/test/spec/server-discovery-and-monitoring/rs/primary_changes_set_name.json index bf70ca3014..3b564d2c93 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_changes_set_name.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_changes_set_name.yml b/test/spec/server-discovery-and-monitoring/rs/primary_changes_set_name.yml index 00ed1c0a13..e49aa24911 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_changes_set_name.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.json b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.json index 3db854f085..73a01a82a9 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.json +++ b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.yml b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.yml index 9a49656549..84c88daa67 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.yml +++ b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.yml @@ -15,7 +15,7 @@ phases: [ hosts: ["a:27017"], setName: "rs", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json index 3a80b150fe..5a91188ea8 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.yml b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.yml index 0d7d294f97..391ec31213 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_electionid.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json index 32e03fb7d4..f7417ad77b 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.yml b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.yml index 41f2f8d7b7..57eeb573e4 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect_setversion.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json b/test/spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json index bc02cc9571..1ca72225a2 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.yml b/test/spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.yml index f5b536c01f..cebbe7d083 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_hint_from_secondary_with_mismatched_me.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.json b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.json index 2d2c0f40d8..6bb6226f8a 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.json +++ b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.json @@ -31,7 +31,7 @@ "ok": 1, "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ] diff --git a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.yml b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.yml index c24fd1a990..25ca1722e0 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_reports_new_member.json b/test/spec/server-discovery-and-monitoring/rs/primary_reports_new_member.json index ac0d9374f0..ed28c48c87 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_reports_new_member.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_reports_new_member.yml b/test/spec/server-discovery-and-monitoring/rs/primary_reports_new_member.yml index de3f528fe9..aa2878d637 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_reports_new_member.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json b/test/spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json index 6dbd73dadc..798a648d19 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.yml b/test/spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.yml index a78982c28e..e8bdb00f0f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_to_no_primary_mismatched_me.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.json b/test/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.json index cc0691fb8c..1366e38996 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.json +++ b/test/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.json @@ -15,7 +15,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.yml b/test/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.yml index d4434522a9..3e463333e6 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_wrong_set_name.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/repeated.json b/test/spec/server-discovery-and-monitoring/rs/repeated.json index 610aeae0ac..3ce0948ab8 100644 --- a/test/spec/server-discovery-and-monitoring/rs/repeated.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/repeated.yml b/test/spec/server-discovery-and-monitoring/rs/repeated.yml index f651005bab..b9e14ed982 100644 --- a/test/spec/server-discovery-and-monitoring/rs/repeated.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.json b/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.json index 3148e1c141..1cd732b82f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.json +++ b/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.yml b/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.yml index 87e80bdb31..6bdf8cbe2d 100644 --- a/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/response_from_removed.json b/test/spec/server-discovery-and-monitoring/rs/response_from_removed.json index 87a66d9e72..fa46a14ceb 100644 --- a/test/spec/server-discovery-and-monitoring/rs/response_from_removed.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/response_from_removed.yml b/test/spec/server-discovery-and-monitoring/rs/response_from_removed.yml index 6ec66c8750..fc9961ce36 100644 --- a/test/spec/server-discovery-and-monitoring/rs/response_from_removed.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/sec_not_auth.json b/test/spec/server-discovery-and-monitoring/rs/sec_not_auth.json index a39855e654..ccbe7a08af 100644 --- a/test/spec/server-discovery-and-monitoring/rs/sec_not_auth.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/sec_not_auth.yml b/test/spec/server-discovery-and-monitoring/rs/sec_not_auth.yml index 09c75f9c78..507eb9d292 100644 --- a/test/spec/server-discovery-and-monitoring/rs/sec_not_auth.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.json b/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.json index 054425c84c..f27060533c 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.yml b/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.yml index de9048d401..b63c43f227 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0-pre-6.0.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json b/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json index ee9519930b..9ffff58ef0 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.yml b/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.yml index d94fafaf99..796e7f668e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_ignore_ok_0.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.json b/test/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.json index 6f1b9b5986..790e4bfca8 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.json +++ b/test/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.json @@ -32,7 +32,7 @@ "ok": 1, "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ] diff --git a/test/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.yml b/test/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.yml index e5f0f9aceb..d359609d83 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.yml +++ b/test/spec/server-discovery-and-monitoring/rs/secondary_mismatched_me.yml @@ -25,4 +25,4 @@ phases: ok: 1 setName: rs minWireVersion: 0 - maxWireVersion: 6 + maxWireVersion: 21 diff --git a/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json b/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json index 8d2f152f59..1f86b50543 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json +++ b/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.json @@ -16,7 +16,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.yml b/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.yml index 0121d631ce..60823815f0 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json b/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json index b7ef2d6d6a..6b89914151 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.yml b/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.yml index acd471e78b..8d1990363c 100644 --- a/test/spec/server-discovery-and-monitoring/rs/secondary_wrong_set_name_with_primary.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json b/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json index c2e2fe5b9b..e62c6963ed 100644 --- a/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml b/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml index 54bfa4d256..0fe6819aa7 100644 --- a/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid-pre-6.0.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.json b/test/spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.json index e9075f97f2..6de995518d 100644 --- a/test/spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.yml b/test/spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.yml index 9c4140925d..2e1c1a551e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/stepdown_change_set_name.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/too_new.json b/test/spec/server-discovery-and-monitoring/rs/too_new.json index 0433d27a36..696246f8e1 100644 --- a/test/spec/server-discovery-and-monitoring/rs/too_new.json +++ b/test/spec/server-discovery-and-monitoring/rs/too_new.json @@ -16,7 +16,7 @@ "b:27017" ], "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/test/spec/server-discovery-and-monitoring/rs/too_new.yml b/test/spec/server-discovery-and-monitoring/rs/too_new.yml index 52912826be..121286554e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/too_new.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.json b/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.json index cc19a961f2..c6ffb321ca 100644 --- a/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.json +++ b/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.yml b/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.yml index d0d8547f96..a9c5a24ee6 100644 --- a/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.yml +++ b/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json b/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json index 5c58b65614..2f9b567b85 100644 --- a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml b/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml index a0434eb45c..24d6accbe0 100644 --- a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid-pre-6.0.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/rs/wrong_set_name.json b/test/spec/server-discovery-and-monitoring/rs/wrong_set_name.json index 9654ff7b79..d0764d24dc 100644 --- a/test/spec/server-discovery-and-monitoring/rs/wrong_set_name.json +++ b/test/spec/server-discovery-and-monitoring/rs/wrong_set_name.json @@ -17,7 +17,7 @@ ], "setName": "wrong", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/rs/wrong_set_name.yml b/test/spec/server-discovery-and-monitoring/rs/wrong_set_name.yml index ae75d6f7e4..e7d3ace92d 100644 --- a/test/spec/server-discovery-and-monitoring/rs/wrong_set_name.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/compatible.json b/test/spec/server-discovery-and-monitoring/sharded/compatible.json index e531db97f9..ceb0ec24c4 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/compatible.json +++ b/test/spec/server-discovery-and-monitoring/sharded/compatible.json @@ -23,7 +23,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/sharded/compatible.yml b/test/spec/server-discovery-and-monitoring/sharded/compatible.yml index 06d5182a5c..20519089f5 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/compatible.yml +++ b/test/spec/server-discovery-and-monitoring/sharded/compatible.yml @@ -17,7 +17,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/test/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.json b/test/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.json index 9e877a0840..bf7e57521c 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.json +++ b/test/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.yml b/test/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.yml index f44a2970dd..1e8adc6c5c 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/discover_single_mongos.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json b/test/spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json index 93fa398d52..3da0f84ca2 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.yml b/test/spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.yml index 7f78d0d6c6..62ae97f057 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/ls_timeout_mongos.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.json b/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.json index 50a93eda5f..29b3351869 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.yml b/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.yml index c4393d85b1..c384b3be11 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.json b/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.json index 311592d715..ae0c2d9cde 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.yml b/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.yml index 0a49d64249..6311605a89 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/non_mongos_removed.json b/test/spec/server-discovery-and-monitoring/sharded/non_mongos_removed.json index d74375ebbf..4698f576d5 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/non_mongos_removed.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/non_mongos_removed.yml b/test/spec/server-discovery-and-monitoring/sharded/non_mongos_removed.yml index ab25349bda..aa604f1100 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/non_mongos_removed.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/sharded/too_old.json b/test/spec/server-discovery-and-monitoring/sharded/too_old.json index 688e1db0f5..b918715ada 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/too_old.json +++ b/test/spec/server-discovery-and-monitoring/sharded/too_old.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 2, - "maxWireVersion": 6 + "maxWireVersion": 21 } ], [ diff --git a/test/spec/server-discovery-and-monitoring/sharded/too_old.yml b/test/spec/server-discovery-and-monitoring/sharded/too_old.yml index 925a8f55b8..a709934c2f 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/too_old.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/compatible.json b/test/spec/server-discovery-and-monitoring/single/compatible.json index 302927598c..493d9b748e 100644 --- a/test/spec/server-discovery-and-monitoring/single/compatible.json +++ b/test/spec/server-discovery-and-monitoring/single/compatible.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/compatible.yml b/test/spec/server-discovery-and-monitoring/single/compatible.yml index b84c1388c3..e183c7127d 100644 --- a/test/spec/server-discovery-and-monitoring/single/compatible.yml +++ b/test/spec/server-discovery-and-monitoring/single/compatible.yml @@ -8,7 +8,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.json b/test/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.json index 90676a8f9b..1461b4c469 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.json +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.json @@ -15,7 +15,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.yml b/test/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.yml index 18c01226a9..0cb73c50e2 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_external_ip.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/direct_connection_mongos.json b/test/spec/server-discovery-and-monitoring/single/direct_connection_mongos.json index 25fe965185..72be020862 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_mongos.json +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_mongos.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_mongos.yml b/test/spec/server-discovery-and-monitoring/single/direct_connection_mongos.yml index 853ce57c17..e81c9aef9b 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_mongos.yml +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_mongos.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.json b/test/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.json index cd8660888a..82a51d390e 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.json +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.yml b/test/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.yml index 21e565fd9c..9a0f3996ca 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_replicaset.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json b/test/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json index e204956056..e06d284364 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.json @@ -17,7 +17,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.yml b/test/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.yml index 7e262c9dbe..d9fa876655 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_rsarbiter.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.json b/test/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.json index 409e8502b3..45eb1602fb 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.json +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.json @@ -16,7 +16,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.yml b/test/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.yml index 4ea0b1551f..85dcb30a7c 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_rsprimary.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.json b/test/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.json index 305f283b52..b1bef8a49f 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.json +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.json @@ -17,7 +17,7 @@ ], "setName": "rs", "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.yml b/test/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.yml index b0c4d1f218..2d7da65e41 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_rssecondary.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/direct_connection_standalone.json b/test/spec/server-discovery-and-monitoring/single/direct_connection_standalone.json index b47278482a..e71ba07e74 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_standalone.json +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_standalone.yml b/test/spec/server-discovery-and-monitoring/single/direct_connection_standalone.yml index cd71087e4d..ab4cb02ad4 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_standalone.yml +++ b/test/spec/server-discovery-and-monitoring/single/direct_connection_standalone.yml @@ -13,7 +13,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.json b/test/spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.json index 71080e6810..8014a0a533 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.yml b/test/spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.yml index f1e48dc419..46b476d049 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_wrong_set_name.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/discover_standalone.json b/test/spec/server-discovery-and-monitoring/single/discover_standalone.json index 858cbdaf63..d78c81654b 100644 --- a/test/spec/server-discovery-and-monitoring/single/discover_standalone.json +++ b/test/spec/server-discovery-and-monitoring/single/discover_standalone.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/discover_standalone.yml b/test/spec/server-discovery-and-monitoring/single/discover_standalone.yml index 49ebb14209..bc112d4eac 100644 --- a/test/spec/server-discovery-and-monitoring/single/discover_standalone.yml +++ b/test/spec/server-discovery-and-monitoring/single/discover_standalone.yml @@ -13,7 +13,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.json b/test/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.json index 87b3e4e8a1..236eabe00a 100644 --- a/test/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.json +++ b/test/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.json @@ -12,7 +12,7 @@ "isWritablePrimary": true, "logicalSessionTimeoutMinutes": 7, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.yml b/test/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.yml index 2926d95a9d..4747af6770 100644 --- a/test/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.yml +++ b/test/spec/server-discovery-and-monitoring/single/ls_timeout_standalone.yml @@ -14,7 +14,7 @@ phases: [ isWritablePrimary: true, logicalSessionTimeoutMinutes: 7, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/single/not_ok_response.json b/test/spec/server-discovery-and-monitoring/single/not_ok_response.json index 8e7c2a10e3..cfaac3564a 100644 --- a/test/spec/server-discovery-and-monitoring/single/not_ok_response.json +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/not_ok_response.yml b/test/spec/server-discovery-and-monitoring/single/not_ok_response.yml index 64103a5902..c1ae7d9875 100644 --- a/test/spec/server-discovery-and-monitoring/single/not_ok_response.yml +++ b/test/spec/server-discovery-and-monitoring/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/test/spec/server-discovery-and-monitoring/single/standalone_removed.json b/test/spec/server-discovery-and-monitoring/single/standalone_removed.json index 57f8f861b1..675cdbb008 100644 --- a/test/spec/server-discovery-and-monitoring/single/standalone_removed.json +++ b/test/spec/server-discovery-and-monitoring/single/standalone_removed.json @@ -11,7 +11,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/standalone_removed.yml b/test/spec/server-discovery-and-monitoring/single/standalone_removed.yml index 59b44b162e..c8404463f7 100644 --- a/test/spec/server-discovery-and-monitoring/single/standalone_removed.yml +++ b/test/spec/server-discovery-and-monitoring/single/standalone_removed.yml @@ -13,7 +13,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json b/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json index 46660fa8de..488cac4918 100644 --- a/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json +++ b/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json @@ -10,7 +10,7 @@ "ok": 1, "ismaster": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml b/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml index a18ecb70fc..82c6ccfa7b 100644 --- a/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml +++ b/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml @@ -12,7 +12,7 @@ phases: [ ok: 1, ismaster: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], diff --git a/test/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.json b/test/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.json index 58ae7d9de4..c3dd98cf62 100644 --- a/test/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.json +++ b/test/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.json @@ -1,5 +1,5 @@ { - "description": "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 6", + "description": "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 21", "uri": "mongodb://a", "phases": [ { @@ -35,7 +35,7 @@ "helloOk": true, "isWritablePrimary": true, "minWireVersion": 0, - "maxWireVersion": 6 + "maxWireVersion": 21 } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.yml b/test/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.yml index aed6bae6e0..87b72b9000 100644 --- a/test/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.yml +++ b/test/spec/server-discovery-and-monitoring/single/too_old_then_upgraded.yml @@ -1,4 +1,4 @@ -description: "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 6" +description: "Standalone with default maxWireVersion of 0 is upgraded to one with maxWireVersion 21" uri: "mongodb://a" phases: [ { @@ -29,7 +29,7 @@ phases: [ helloOk: true, isWritablePrimary: true, minWireVersion: 0, - maxWireVersion: 6 + maxWireVersion: 21 }] ], outcome: { diff --git a/test/tools/mongodb-mock/index.js b/test/tools/mongodb-mock/index.js index f4fb35625e..bffb474836 100644 --- a/test/tools/mongodb-mock/index.js +++ b/test/tools/mongodb-mock/index.js @@ -17,8 +17,8 @@ const DEFAULT_HELLO = { ok: 1 }; -const DEFAULT_HELLO_36 = Object.assign({}, DEFAULT_HELLO, { - maxWireVersion: 6, +const DEFAULT_HELLO_40 = Object.assign({}, DEFAULT_HELLO, { + maxWireVersion: 7, logicalSessionTimeoutMinutes: 10 }); @@ -92,5 +92,5 @@ function cleanup(spy, callback) { module.exports = { createServer, cleanup, - HELLO: DEFAULT_HELLO_36 + HELLO: DEFAULT_HELLO_40 }; diff --git a/test/unit/assorted/server_selection_spec_helper.js b/test/unit/assorted/server_selection_spec_helper.js index 81303f3e6a..8fb4bee676 100644 --- a/test/unit/assorted/server_selection_spec_helper.js +++ b/test/unit/assorted/server_selection_spec_helper.js @@ -51,7 +51,7 @@ function serverDescriptionFromDefinition(definition, hosts) { fakeHello.lastWrite = definition.lastWrite; // default max wire version is `6` - fakeHello.maxWireVersion = fakeHello.maxWireVersion || 6; + fakeHello.maxWireVersion = fakeHello.maxWireVersion || 21; const serverDescription = new ServerDescription(definition.address, fakeHello, { roundTripTime: definition.avg_rtt_ms diff --git a/test/unit/cmap/wire_protocol/constants.test.ts b/test/unit/cmap/wire_protocol/constants.test.ts index 81fb1e8106..41445944bc 100644 --- a/test/unit/cmap/wire_protocol/constants.test.ts +++ b/test/unit/cmap/wire_protocol/constants.test.ts @@ -9,8 +9,8 @@ import { describe('Wire Protocol Constants', function () { describe('MIN_SUPPORTED_SERVER_VERSION', function () { - it('returns 3.6', function () { - expect(MIN_SUPPORTED_SERVER_VERSION).to.equal('3.6'); + it('returns 4.0', function () { + expect(MIN_SUPPORTED_SERVER_VERSION).to.equal('4.0'); }); }); @@ -21,8 +21,8 @@ describe('Wire Protocol Constants', function () { }); describe('MIN_SUPPORTED_WIRE_VERSION', function () { - it('returns 6', function () { - expect(MIN_SUPPORTED_WIRE_VERSION).to.equal(6); + it('returns 7', function () { + expect(MIN_SUPPORTED_WIRE_VERSION).to.equal(7); }); }); diff --git a/test/unit/connection_string.spec.test.ts b/test/unit/connection_string.spec.test.ts index 6fb0aba7c3..a76fdd35c6 100644 --- a/test/unit/connection_string.spec.test.ts +++ b/test/unit/connection_string.spec.test.ts @@ -3,7 +3,8 @@ import { executeUriValidationTest } from '../tools/uri_spec_runner'; const skipTests = [ // TODO(NODE-3914): Fix; note that wtimeoutms will be deprecated via DRIVERS-555 (NODE-3078) - 'Deprecated (or unknown) options are ignored if replacement exists' + 'Deprecated (or unknown) options are ignored if replacement exists', + 'Colon in a key value pair' ]; describe('Connection String spec tests', function () { From af23cd0d291a0013e3e623e2ac329c0eb00fd7d0 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Mon, 16 Sep 2024 17:12:14 +0200 Subject: [PATCH 2/3] chore: remove comments --- src/db.ts | 2 +- src/explain.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/db.ts b/src/db.ts index 0dcd24dbb1..53c18e44af 100644 --- a/src/db.ts +++ b/src/db.ts @@ -279,7 +279,7 @@ export class Db { } /** - * Execute an aggregation framework pipeline against the database, needs MongoDB \>= 3.6 + * Execute an aggregation framework pipeline against the database. * * @param pipeline - An array of aggregation stages to be executed * @param options - Optional settings for the command diff --git a/src/explain.ts b/src/explain.ts index 0d08e694a6..6637aae80c 100644 --- a/src/explain.ts +++ b/src/explain.ts @@ -13,8 +13,7 @@ export type ExplainVerbosity = string; /** * For backwards compatibility, true is interpreted as "allPlansExecution" - * and false as "queryPlanner". Prior to server version 3.6, aggregate() - * ignores the verbosity parameter and executes in "queryPlanner". + * and false as "queryPlanner". * @public */ export type ExplainVerbosityLike = ExplainVerbosity | boolean; From 2b959eb434cbe2123e60d7bcdcae7e0077dd2468 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Mon, 16 Sep 2024 17:13:37 +0200 Subject: [PATCH 3/3] chore: add skipped test comment --- test/unit/connection_string.spec.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unit/connection_string.spec.test.ts b/test/unit/connection_string.spec.test.ts index a76fdd35c6..b1585db92d 100644 --- a/test/unit/connection_string.spec.test.ts +++ b/test/unit/connection_string.spec.test.ts @@ -4,6 +4,7 @@ import { executeUriValidationTest } from '../tools/uri_spec_runner'; const skipTests = [ // TODO(NODE-3914): Fix; note that wtimeoutms will be deprecated via DRIVERS-555 (NODE-3078) 'Deprecated (or unknown) options are ignored if replacement exists', + // Note this will always be skipped as the URI class cannot properly parse these. 'Colon in a key value pair' ];