diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 255ca39bf62..ac1e404bac3 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1,6 +1,6 @@ stepback: true command_type: system -exec_timeout_secs: 900 +exec_timeout_secs: 1200 timeout: - command: shell.exec params: diff --git a/.evergreen/config.yml.in b/.evergreen/config.yml.in index 54a5d0cee14..e9fa0553ef2 100644 --- a/.evergreen/config.yml.in +++ b/.evergreen/config.yml.in @@ -11,7 +11,7 @@ command_type: system # Protect ourself against rogue test case, or curl gone wild, that runs forever # Good rule of thumb: the averageish length a task takes, times 5 # That roughly accounts for variable system performance for various buildvariants -exec_timeout_secs: 900 +exec_timeout_secs: 1200 # What to do when evergreen hits the timeout (`post:` tasks are run automatically) timeout: diff --git a/src/cmap/connect.ts b/src/cmap/connect.ts index 0d4246944bb..b33ea781804 100644 --- a/src/cmap/connect.ts +++ b/src/cmap/connect.ts @@ -119,6 +119,10 @@ function performInitialHandshake( response.ismaster = response.isWritablePrimary; } + if (response.helloOk) { + conn.helloOk = true; + } + const supportedServerErr = checkSupportedServer(response, options); if (supportedServerErr) { callback(supportedServerErr); @@ -158,6 +162,7 @@ function performInitialHandshake( export interface HandshakeDocument extends Document { ismaster?: boolean; hello?: boolean; + helloOk?: boolean; client: ClientMetadata; compression: string[]; saslSupportedMechs?: string; @@ -170,6 +175,7 @@ function prepareHandshakeDocument(authContext: AuthContext, callback: Callback { destroyed: boolean; lastIsMasterMS?: number; serverApi?: ServerApi; + helloOk?: boolean; /** @internal */ [kDescription]: StreamDescription; /** @internal */ diff --git a/src/sdam/monitor.ts b/src/sdam/monitor.ts index 420a56641da..aad980713c7 100644 --- a/src/sdam/monitor.ts +++ b/src/sdam/monitor.ts @@ -227,14 +227,14 @@ function checkServer(monitor: Monitor, callback: Callback) { const connection = monitor[kConnection]; if (connection && !connection.closed) { - const { serverApi } = connection; + const { serverApi, helloOk } = connection; const connectTimeoutMS = monitor.options.connectTimeoutMS; const maxAwaitTimeMS = monitor.options.heartbeatFrequencyMS; const topologyVersion = monitor[kServer].description.topologyVersion; const isAwaitable = topologyVersion != null; const cmd = { - [serverApi?.version ? 'hello' : 'ismaster']: true, + [serverApi?.version || helloOk ? 'hello' : 'ismaster']: true, ...(isAwaitable && topologyVersion ? { maxAwaitTimeMS, topologyVersion: makeTopologyVersion(topologyVersion) } : {}) diff --git a/src/sdam/server_description.ts b/src/sdam/server_description.ts index edda8381829..76f8ccff082 100644 --- a/src/sdam/server_description.ts +++ b/src/sdam/server_description.ts @@ -222,7 +222,7 @@ export function parseServerType(ismaster?: Document): ServerType { if (ismaster.setName) { if (ismaster.hidden) { return ServerType.RSOther; - } else if (ismaster.ismaster) { + } else if (ismaster.ismaster || ismaster.isWritablePrimary) { return ServerType.RSPrimary; } else if (ismaster.secondary) { return ServerType.RSSecondary; diff --git a/test/functional/mongo_client_options.test.js b/test/functional/mongo_client_options.test.js index 814e5414808..c5a1f60d522 100644 --- a/test/functional/mongo_client_options.test.js +++ b/test/functional/mongo_client_options.test.js @@ -64,13 +64,16 @@ describe('MongoClient Options', function () { const args = Array.prototype.slice.call(arguments); const ns = args[0]; const command = args[1]; - const options = args[2]; - if (ns.toString() === 'admin.$cmd' && command.ismaster && options.exhaustAllowed) { - stub.restore(); + const options = args[2] || {}; + if ( + ns.toString() === 'admin.$cmd' && + (command.ismaster || command.hello) && + options.exhaustAllowed + ) { expect(options).property('socketTimeoutMS').to.equal(0); + stub.restore(); client.close(done); } - stub.wrappedMethod.apply(this, args); }); }); @@ -90,13 +93,16 @@ describe('MongoClient Options', function () { const args = Array.prototype.slice.call(arguments); const ns = args[0]; const command = args[1]; - const options = args[2]; - if (ns.toString() === 'admin.$cmd' && command.ismaster && options.exhaustAllowed) { - stub.restore(); + const options = args[2] || {}; + if ( + ns.toString() === 'admin.$cmd' && + (command.ismaster || command.hello) && + options.exhaustAllowed + ) { expect(options).property('socketTimeoutMS').to.equal(510); + stub.restore(); client.close(done); } - stub.wrappedMethod.apply(this, args); }); }); diff --git a/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.json b/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.json index cdd6df62474..56ca7d11328 100644 --- a/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.json +++ b/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.yml b/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.yml index 9f0bf919ffc..8482ea704c2 100644 --- a/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.yml +++ b/test/spec/server-discovery-and-monitoring/errors/error_handling_handshake.yml @@ -5,7 +5,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/generate-error-tests.py b/test/spec/server-discovery-and-monitoring/errors/generate-error-tests.py index 877363996e4..c9323857adb 100644 --- a/test/spec/server-discovery-and-monitoring/errors/generate-error-tests.py +++ b/test/spec/server-discovery-and-monitoring/errors/generate-error-tests.py @@ -35,11 +35,11 @@ def write_test(filename, data): ERR_CODES = { 'InterruptedAtShutdown': (11600,), 'InterruptedDueToReplStateChange': (11602,), - 'NotMasterOrSecondary': (13436,), + 'NotPrimaryOrSecondary': (13436,), 'PrimarySteppedDown': (189,), 'ShutdownInProgress': (91,), - 'NotMaster': (10107,), - 'NotMasterNoSlaveOk': (13435,), + 'NotWritablePrimary': (10107,), + 'NotPrimaryNoSecondaryOk': (13435,), 'LegacyNotPrimary': (10058,), } @@ -139,7 +139,7 @@ def create_stale_generation_tests(): def create_pre_42_tests(): tmp = template('pre-42.yml.template') - # All "not master"/"node is recovering" clear the pool on <4.2 + # All "not writable primary"/"node is recovering" clear the pool on <4.2 for error_name in ERR_CODES: test_name = f'pre-42-{error_name}' error_code, = ERR_CODES[error_name] diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-network-error.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-network-error.json index d0765dbb6d4..c22a47dc8ac 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-network-error.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-network-error.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-network-error.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-network-error.yml index 086950b9568..3d29debefe9 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-network-error.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-network-error.yml @@ -5,7 +5,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.json index 7c1a197a625..03dc5b66c96 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.yml index f06e9efb0e9..0c27f52d2ed 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-network-timeout-error.yml @@ -5,7 +5,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.json index 68b7f455aa7..777e703a3cc 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml index 407c18b60c6..9672debcebe 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.json index d4a409d268d..c4aa7fb71ba 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml index 616690ee5a7..87162a15957 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json index e1f33b81bba..2a9bc8a5cfc 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml index daa7925b1e1..ca25a165125 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-LegacyNotPrimary.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.json similarity index 87% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.json index 30d8698aac8..638aa306cb6 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion greater NotMasterNoSlaveOk error", + "description": "Non-stale topologyVersion greater NotPrimaryNoSecondaryOk error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion greater NotMasterNoSlaveOk error marks server Unknown", + "description": "Non-stale topologyVersion greater NotPrimaryNoSecondaryOk error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", + "errmsg": "NotPrimaryNoSecondaryOk", "code": 13435, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml similarity index 83% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml index 86196dae192..b5dfc46978b 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion greater NotMasterNoSlaveOk error +description: Non-stale topologyVersion greater NotPrimaryNoSecondaryOk error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion greater NotMasterNoSlaveOk error marks server Unknown +- description: Non-stale topologyVersion greater NotPrimaryNoSecondaryOk error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk + errmsg: NotPrimaryNoSecondaryOk code: 13435 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.json similarity index 87% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.json index 9d1c2365655..f327954a9db 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion greater NotMasterOrSecondary error", + "description": "Non-stale topologyVersion greater NotPrimaryOrSecondary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion greater NotMasterOrSecondary error marks server Unknown", + "description": "Non-stale topologyVersion greater NotPrimaryOrSecondary error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml similarity index 83% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml index 7437afeb40f..8583704c90a 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion greater NotMasterOrSecondary error +description: Non-stale topologyVersion greater NotPrimaryOrSecondary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion greater NotMasterOrSecondary error marks server Unknown +- description: Non-stale topologyVersion greater NotPrimaryOrSecondary error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.json similarity index 88% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.json index dbd7154573b..0ac02fb19b6 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion greater NotMaster error", + "description": "Non-stale topologyVersion greater NotWritablePrimary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion greater NotMaster error marks server Unknown", + "description": "Non-stale topologyVersion greater NotWritablePrimary error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", + "errmsg": "NotWritablePrimary", "code": 10107, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml similarity index 84% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml index aae29895a15..6770de05193 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion greater NotMaster error +description: Non-stale topologyVersion greater NotWritablePrimary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion greater NotMaster error marks server Unknown +- description: Non-stale topologyVersion greater NotWritablePrimary error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMaster + errmsg: NotWritablePrimary code: 10107 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.json index d189dd3fbaa..daf2a7e8e10 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml index 972acc14b11..a302307d97c 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.json index 9e88f5ce3fe..a7d9e1fe24e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml index 6b892864ae7..2d7a0c7d271 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-greater-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.json index 06c61a93dab..2c59e785ab3 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml index d870a57687f..74e59d20567 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.json index ebf5a1a4a16..f2cb834e838 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml index 03120cc5861..3eab8ad40fe 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json index ccaacd1cfe7..095128d615c 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml index 04c725e4460..a7d0113357b 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-LegacyNotPrimary.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.json similarity index 85% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.json index 502ebc549c2..3d7312d4a5e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion missing NotMasterNoSlaveOk error", + "description": "Non-stale topologyVersion missing NotPrimaryNoSecondaryOk error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion missing NotMasterNoSlaveOk error marks server Unknown", + "description": "Non-stale topologyVersion missing NotPrimaryNoSecondaryOk error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", + "errmsg": "NotPrimaryNoSecondaryOk", "code": 13435 } } diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml similarity index 80% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml index 5b25c67e3a5..0f432460704 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion missing NotMasterNoSlaveOk error +description: Non-stale topologyVersion missing NotPrimaryNoSecondaryOk error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion missing NotMasterNoSlaveOk error marks server Unknown +- description: Non-stale topologyVersion missing NotPrimaryNoSecondaryOk error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk + errmsg: NotPrimaryNoSecondaryOk code: 13435 outcome: servers: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.json similarity index 85% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.json index 8e84038e29c..a457ba30728 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion missing NotMasterOrSecondary error", + "description": "Non-stale topologyVersion missing NotPrimaryOrSecondary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion missing NotMasterOrSecondary error marks server Unknown", + "description": "Non-stale topologyVersion missing NotPrimaryOrSecondary error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436 } } diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml similarity index 80% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml index 3847cd62919..fcc72bf7940 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion missing NotMasterOrSecondary error +description: Non-stale topologyVersion missing NotPrimaryOrSecondary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion missing NotMasterOrSecondary error marks server Unknown +- description: Non-stale topologyVersion missing NotPrimaryOrSecondary error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 outcome: servers: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.json similarity index 86% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.json index 54ce115e68c..b7427a3f3d9 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion missing NotMaster error", + "description": "Non-stale topologyVersion missing NotWritablePrimary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion missing NotMaster error marks server Unknown", + "description": "Non-stale topologyVersion missing NotWritablePrimary error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", + "errmsg": "NotWritablePrimary", "code": 10107 } } diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml similarity index 81% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml index 55d9a9bb30d..4a9ef427fb1 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion missing NotMaster error +description: Non-stale topologyVersion missing NotWritablePrimary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion missing NotMaster error marks server Unknown +- description: Non-stale topologyVersion missing NotWritablePrimary error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMaster + errmsg: NotWritablePrimary code: 10107 outcome: servers: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.json index f7e0932542f..8146a60d6e5 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml index f248336cf32..8ca1251a2d4 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.json index 5eceb1bcee9..c7597007d73 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml index a02ac1a04cc..cd8857008db 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-missing-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.json index 2b77eb2087a..8448c605992 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml index c2a0263694b..126ed23b44e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.json index 584219e508b..9d601c4ede3 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml index 8317ecbee04..bcb69479d18 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json index da36e9b33ca..8be833f1046 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml index b333863c15c..172240cb780 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-LegacyNotPrimary.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.json similarity index 92% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.json index 812b9735244..f2f94c0d007 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion proccessId changed NotMasterNoSlaveOk error", + "description": "Non-stale topologyVersion proccessId changed NotPrimaryNoSecondaryOk error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion proccessId changed NotMasterNoSlaveOk error marks server Unknown", + "description": "Non-stale topologyVersion proccessId changed NotPrimaryNoSecondaryOk error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", + "errmsg": "NotPrimaryNoSecondaryOk", "code": 13435, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml similarity index 82% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml index 12b7a21a6ae..b915fb97f3b 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion proccessId changed NotMasterNoSlaveOk error +description: Non-stale topologyVersion proccessId changed NotPrimaryNoSecondaryOk error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion proccessId changed NotMasterNoSlaveOk error marks server Unknown +- description: Non-stale topologyVersion proccessId changed NotPrimaryNoSecondaryOk error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk + errmsg: NotPrimaryNoSecondaryOk code: 13435 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.json similarity index 92% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.json index 027f4bddee3..6d3b397566e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion proccessId changed NotMasterOrSecondary error", + "description": "Non-stale topologyVersion proccessId changed NotPrimaryOrSecondary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion proccessId changed NotMasterOrSecondary error marks server Unknown", + "description": "Non-stale topologyVersion proccessId changed NotPrimaryOrSecondary error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml similarity index 82% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml index 3531a1d85a8..dc104488cdf 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion proccessId changed NotMasterOrSecondary error +description: Non-stale topologyVersion proccessId changed NotPrimaryOrSecondary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion proccessId changed NotMasterOrSecondary error marks server Unknown +- description: Non-stale topologyVersion proccessId changed NotPrimaryOrSecondary error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.json similarity index 92% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.json index b7bdfabd2d9..332ddf5ec12 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Non-stale topologyVersion proccessId changed NotMaster error", + "description": "Non-stale topologyVersion proccessId changed NotWritablePrimary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Non-stale topologyVersion proccessId changed NotMaster error marks server Unknown", + "description": "Non-stale topologyVersion proccessId changed NotWritablePrimary error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", + "errmsg": "NotWritablePrimary", "code": 10107, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml similarity index 83% rename from test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml index b753d838ad9..5146636b65a 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Non-stale topologyVersion proccessId changed NotMaster error +description: Non-stale topologyVersion proccessId changed NotWritablePrimary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Non-stale topologyVersion proccessId changed NotMaster error marks server Unknown +- description: Non-stale topologyVersion proccessId changed NotWritablePrimary error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMaster + errmsg: NotWritablePrimary code: 10107 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.json index 6a49618cfd5..c22a537f582 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml index ff7223bcf68..0c997a2a3ef 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.json index 3c3c934f8ec..eaaab79273e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml index 0efea109399..973c56460bd 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion-proccessId-changed-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion.yml.template b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion.yml.template index 22c56b63b69..83cff68e272 100644 --- a/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion.yml.template +++ b/test/spec/server-discovery-and-monitoring/errors/non-stale-topologyVersion.yml.template @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.json index 9e171142d16..40c4ed6c803 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.yml index c305131418f..73a0f0d2853 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.json index 52410f0b272..5c489f5ecba 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.yml index d3521bd743b..ad333e311ec 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.json b/test/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.json index 731da196b55..f0851b299e4 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.json +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.yml b/test/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.yml index 56de3a23a90..9c7723bbf38 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-LegacyNotPrimary.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.json similarity index 84% rename from test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.json index fa5c1f37d5b..a675f0ca543 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Post-4.2 NotMasterNoSlaveOk error", + "description": "Post-4.2 NotPrimaryNoSecondaryOk error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,7 @@ } }, { - "description": "Post-4.2 NotMasterNoSlaveOk error marks server Unknown", + "description": "Post-4.2 NotPrimaryNoSecondaryOk error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -45,7 +46,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", + "errmsg": "NotPrimaryNoSecondaryOk", "code": 13435 } } diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.yml similarity index 81% rename from test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.yml index 2481cad869f..49304d6d636 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Post-4.2 NotMasterNoSlaveOk error +description: Post-4.2 NotPrimaryNoSecondaryOk error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -24,7 +25,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Post-4.2 NotMasterNoSlaveOk error marks server Unknown +- description: Post-4.2 NotPrimaryNoSecondaryOk error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -32,7 +33,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk + errmsg: NotPrimaryNoSecondaryOk code: 13435 outcome: servers: diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.json similarity index 84% rename from test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.json index 5023662723d..ea9bf1d16bd 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Post-4.2 NotMasterOrSecondary error", + "description": "Post-4.2 NotPrimaryOrSecondary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,7 @@ } }, { - "description": "Post-4.2 NotMasterOrSecondary error marks server Unknown", + "description": "Post-4.2 NotPrimaryOrSecondary error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -45,7 +46,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436 } } diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.yml similarity index 81% rename from test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.yml index 1f8e65ad2dd..9174b310572 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Post-4.2 NotMasterOrSecondary error +description: Post-4.2 NotPrimaryOrSecondary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -24,7 +25,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Post-4.2 NotMasterOrSecondary error marks server Unknown +- description: Post-4.2 NotPrimaryOrSecondary error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -32,7 +33,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 outcome: servers: diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.json similarity index 85% rename from test/spec/server-discovery-and-monitoring/errors/post-42-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.json index 6cbb23b89ce..10211fca708 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Post-4.2 NotMaster error", + "description": "Post-4.2 NotWritablePrimary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,7 @@ } }, { - "description": "Post-4.2 NotMaster error marks server Unknown", + "description": "Post-4.2 NotWritablePrimary error marks server Unknown", "applicationErrors": [ { "address": "a:27017", @@ -45,7 +46,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", + "errmsg": "NotWritablePrimary", "code": 10107 } } diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.yml similarity index 82% rename from test/spec/server-discovery-and-monitoring/errors/post-42-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.yml index 2a01f1ccba1..886b1f5b5bc 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Post-4.2 NotMaster error +description: Post-4.2 NotWritablePrimary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -24,7 +25,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Post-4.2 NotMaster error marks server Unknown +- description: Post-4.2 NotWritablePrimary error marks server Unknown applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -32,7 +33,7 @@ phases: type: command response: ok: 0 - errmsg: NotMaster + errmsg: NotWritablePrimary code: 10107 outcome: servers: diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.json index d58ff26e528..fa98d0bf069 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.yml index 38211af72db..6a42267996b 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.json index a44ecc38248..cd587205b62 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.yml index 76de04df9ec..2ad90d9864f 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/post-42-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/post-42.yml.template b/test/spec/server-discovery-and-monitoring/errors/post-42.yml.template index 251961f93be..8ca3c79ba45 100644 --- a/test/spec/server-discovery-and-monitoring/errors/post-42.yml.template +++ b/test/spec/server-discovery-and-monitoring/errors/post-42.yml.template @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.json index 5944fe705cf..9f6ea212e5c 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.yml index 16b4fe638b1..4996e9f25ff 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.json index 06ed1187792..7e5f2357134 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.yml index 3feac00df5e..ada5f1ff736 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.json b/test/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.json index db5acd718d9..1635f1a8568 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.json +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.yml b/test/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.yml index 37574741516..e2b37b4f5f1 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-LegacyNotPrimary.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.json similarity index 81% rename from test/spec/server-discovery-and-monitoring/errors/pre-42-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.json index a6a6bba87a2..0e70ede02c9 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Pre-4.2 NotMaster error", + "description": "Pre-4.2 NotPrimaryNoSecondaryOk error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,7 @@ } }, { - "description": "Pre-4.2 NotMaster error marks server Unknown and clears the pool", + "description": "Pre-4.2 NotPrimaryNoSecondaryOk error marks server Unknown and clears the pool", "applicationErrors": [ { "address": "a:27017", @@ -45,8 +46,8 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", - "code": 10107 + "errmsg": "NotPrimaryNoSecondaryOk", + "code": 13435 } } ], diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.yml similarity index 78% rename from test/spec/server-discovery-and-monitoring/errors/pre-42-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.yml index 522480a4b94..867b7d3dc15 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 NotMaster error +description: Pre-4.2 NotPrimaryNoSecondaryOk error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -24,7 +25,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Pre-4.2 NotMaster error marks server Unknown and clears the pool +- description: Pre-4.2 NotPrimaryNoSecondaryOk error marks server Unknown and clears the pool applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -32,8 +33,8 @@ phases: type: command response: ok: 0 - errmsg: NotMaster - code: 10107 + errmsg: NotPrimaryNoSecondaryOk + code: 13435 outcome: servers: a:27017: diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.json similarity index 83% rename from test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.json index f5158982810..3fefb216634 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Pre-4.2 NotMasterOrSecondary error", + "description": "Pre-4.2 NotPrimaryOrSecondary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,7 @@ } }, { - "description": "Pre-4.2 NotMasterOrSecondary error marks server Unknown and clears the pool", + "description": "Pre-4.2 NotPrimaryOrSecondary error marks server Unknown and clears the pool", "applicationErrors": [ { "address": "a:27017", @@ -45,7 +46,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436 } } diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.yml similarity index 80% rename from test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.yml index c29ede78111..705e2339c01 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 NotMasterOrSecondary error +description: Pre-4.2 NotPrimaryOrSecondary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -24,7 +25,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Pre-4.2 NotMasterOrSecondary error marks server Unknown and clears the pool +- description: Pre-4.2 NotPrimaryOrSecondary error marks server Unknown and clears the pool applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -32,7 +33,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 outcome: servers: diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.json similarity index 84% rename from test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.json index 1eb72bc033f..d010da0a5bc 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Pre-4.2 NotMasterNoSlaveOk error", + "description": "Pre-4.2 NotWritablePrimary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,7 @@ } }, { - "description": "Pre-4.2 NotMasterNoSlaveOk error marks server Unknown and clears the pool", + "description": "Pre-4.2 NotWritablePrimary error marks server Unknown and clears the pool", "applicationErrors": [ { "address": "a:27017", @@ -45,8 +46,8 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", - "code": 13435 + "errmsg": "NotWritablePrimary", + "code": 10107 } } ], diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.yml similarity index 81% rename from test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.yml index a07dd16489c..29669ff336e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Pre-4.2 NotMasterNoSlaveOk error +description: Pre-4.2 NotWritablePrimary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -24,7 +25,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Pre-4.2 NotMasterNoSlaveOk error marks server Unknown and clears the pool +- description: Pre-4.2 NotWritablePrimary error marks server Unknown and clears the pool applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -32,8 +33,8 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk - code: 13435 + errmsg: NotWritablePrimary + code: 10107 outcome: servers: a:27017: diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.json index e4c3228afcf..02956d201dd 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.yml index 7a9d1580ca8..9176ee25c3f 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.json index 00dc7c1b5b9..fc3a5aa6fee 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.yml index 3110fbe5b86..5c64050e591 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/pre-42.yml.template b/test/spec/server-discovery-and-monitoring/errors/pre-42.yml.template index 5f91c4482dd..7449f68c163 100644 --- a/test/spec/server-discovery-and-monitoring/errors/pre-42.yml.template +++ b/test/spec/server-discovery-and-monitoring/errors/pre-42.yml.template @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/prefer-error-code.json b/test/spec/server-discovery-and-monitoring/errors/prefer-error-code.json index 486103a4575..21d123f4295 100644 --- a/test/spec/server-discovery-and-monitoring/errors/prefer-error-code.json +++ b/test/spec/server-discovery-and-monitoring/errors/prefer-error-code.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "errmsg \"not master\" gets ignored when error code exists", + "description": "errmsg \"not writable primary\" gets ignored when error code exists", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "not master", + "errmsg": "not writable primary", "code": 1 } } diff --git a/test/spec/server-discovery-and-monitoring/errors/prefer-error-code.yml b/test/spec/server-discovery-and-monitoring/errors/prefer-error-code.yml index f7c76b9e31d..dcbe0da41a0 100644 --- a/test/spec/server-discovery-and-monitoring/errors/prefer-error-code.yml +++ b/test/spec/server-discovery-and-monitoring/errors/prefer-error-code.yml @@ -5,7 +5,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -28,7 +29,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: errmsg "not master" gets ignored when error code exists +- description: errmsg "not writable primary" gets ignored when error code exists applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -36,8 +37,8 @@ phases: type: command response: ok: 0 - errmsg: "not master" - code: 1 # Not a "not master" error code. + errmsg: "not writable primary" + code: 1 # Not a "not writable primary" error code. outcome: *outcome - description: errmsg "node is recovering" gets ignored when error code exists diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.json index f675f2651ed..2f7c7fd13b1 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.yml index a32f6de2d97..37dddcead54 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.json index a4ae13ee78e..b0b51ef676f 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.yml index b493952943a..f83532e2c53 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.json similarity index 92% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.json index d58349b6221..b68e23b7a78 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMasterNoSlaveOk error", + "description": "Stale generation NotPrimaryNoSecondaryOk error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMasterNoSlaveOk error (stale generation)", + "description": "Ignore stale NotPrimaryNoSecondaryOk error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,7 +136,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", + "errmsg": "NotPrimaryNoSecondaryOk", "code": 13435, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.yml similarity index 87% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.yml index a39de00e04b..43c7f57742d 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMasterNoSlaveOk error +description: Stale generation NotPrimaryNoSecondaryOk error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMasterNoSlaveOk error (stale generation) +- description: Ignore stale NotPrimaryNoSecondaryOk error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,7 +81,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk + errmsg: NotPrimaryNoSecondaryOk code: 13435 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.json similarity index 92% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.json index 851bea0928f..d9b35626545 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMasterOrSecondary error afterHandshakeCompletes", + "description": "Stale generation NotPrimaryOrSecondary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMasterOrSecondary error (stale generation)", + "description": "Ignore stale NotPrimaryOrSecondary error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,7 +136,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.yml similarity index 88% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.yml index a6cdd3f21ad..1dc6a2319ec 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMasterOrSecondary error +description: Stale generation NotPrimaryOrSecondary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMasterOrSecondary error (stale generation) +- description: Ignore stale NotPrimaryOrSecondary error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,7 +81,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.json similarity index 92% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.json index dbdce1583a9..90889356dd3 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMaster error afterHandshakeCompletes", + "description": "Stale generation NotWritablePrimary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMaster error (stale generation)", + "description": "Ignore stale NotWritablePrimary error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,7 +136,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", + "errmsg": "NotWritablePrimary", "code": 10107, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.yml similarity index 88% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.yml index 66493e2f58f..488eaab4a5f 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMaster error +description: Stale generation NotWritablePrimary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMaster error (stale generation) +- description: Ignore stale NotWritablePrimary error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,7 +81,7 @@ phases: type: command response: ok: 0 - errmsg: NotMaster + errmsg: NotWritablePrimary code: 10107 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.json index 2e80ba49499..0a707a1c071 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.yml index f41440af603..2b450810872 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.json index 9b5656d48b8..5da3413d5bb 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.yml index 0d7f9782430..b9bd8212d99 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.json index 9da8b60fbb2..d29310fb619 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml index 654cff5d29e..48dd257af96 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.json index f0a7df61706..376bb937702 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml index f6d5e374a40..5e7ddeaa363 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json index 2169c4a6fbb..990fc45e4e9 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml index f7ccdf8d4a8..8701f366aba 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-LegacyNotPrimary.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.json similarity index 91% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.json index cfe779ee6f2..1744a82f77e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMaster error", + "description": "Stale generation NotPrimaryNoSecondaryOk error afterHandshakeCompletes", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMaster error (stale generation)", + "description": "Ignore stale NotPrimaryNoSecondaryOk error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,8 +136,8 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", - "code": 10107, + "errmsg": "NotPrimaryNoSecondaryOk", + "code": 13435, "topologyVersion": { "processId": { "$oid": "000000000000000000000001" diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml similarity index 86% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml index 352d016c59f..70673e9fe67 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMaster error afterHandshakeCompletes +description: Stale generation NotPrimaryNoSecondaryOk error afterHandshakeCompletes uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMaster error (stale generation) +- description: Ignore stale NotPrimaryNoSecondaryOk error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,8 +81,8 @@ phases: type: command response: ok: 0 - errmsg: NotMaster - code: 10107 + errmsg: NotPrimaryNoSecondaryOk + code: 13435 topologyVersion: processId: "$oid": '000000000000000000000001' diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.json similarity index 91% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.json index 11ee0625894..57ca1cf158b 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMasterOrSecondary error", + "description": "Stale generation NotPrimaryOrSecondary error afterHandshakeCompletes", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMasterOrSecondary error (stale generation)", + "description": "Ignore stale NotPrimaryOrSecondary error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,7 +136,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml similarity index 87% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml index 665d8b986ba..4b036edd0d8 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMasterOrSecondary error afterHandshakeCompletes +description: Stale generation NotPrimaryOrSecondary error afterHandshakeCompletes uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMasterOrSecondary error (stale generation) +- description: Ignore stale NotPrimaryOrSecondary error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,7 +81,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.json similarity index 92% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.json index 707a58bcafd..995453c82bd 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMasterNoSlaveOk error afterHandshakeCompletes", + "description": "Stale generation NotWritablePrimary error afterHandshakeCompletes", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMasterNoSlaveOk error (stale generation)", + "description": "Ignore stale NotWritablePrimary error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,8 +136,8 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", - "code": 13435, + "errmsg": "NotWritablePrimary", + "code": 10107, "topologyVersion": { "processId": { "$oid": "000000000000000000000001" diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml similarity index 87% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml index 0dd1321d554..f9199ef48fc 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMasterNoSlaveOk error afterHandshakeCompletes +description: Stale generation NotWritablePrimary error afterHandshakeCompletes uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMasterNoSlaveOk error (stale generation) +- description: Ignore stale NotWritablePrimary error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,8 +81,8 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk - code: 13435 + errmsg: NotWritablePrimary + code: 10107 topologyVersion: processId: "$oid": '000000000000000000000001' diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.json index 7ac8d2db249..bf4c85d24f3 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml index 897bac6f5b7..032993e749e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.json index e250c448aa8..9374900e066 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml index c607f646a24..23659f729b2 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.json index 94b8322d2da..f5d01b65402 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.yml index 7f3b104cc58..98cb9a44e1d 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-network.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json index 490703de906..fa84343b0b1 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.yml index 2a42ffb65eb..37b8f71d8d0 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-afterHandshakeCompletes-timeout.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.json index 8b10f5eb754..72fac9a86ec 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml index 9b3f9c11d79..c699c53ab14 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.json index ec78d667c2e..3c713592a30 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml index 8332db4fa42..a9826eb01ac 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json index 674cb994cd0..257b6ec6fbf 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml index a37ca734426..f26d4d963f0 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-LegacyNotPrimary.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.json similarity index 91% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.json index 760f260d48e..dcb5716f445 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMaster error beforeHandshakeCompletes", + "description": "Stale generation NotPrimaryNoSecondaryOk error beforeHandshakeCompletes", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMaster error (stale generation)", + "description": "Ignore stale NotPrimaryNoSecondaryOk error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,8 +136,8 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", - "code": 10107, + "errmsg": "NotPrimaryNoSecondaryOk", + "code": 13435, "topologyVersion": { "processId": { "$oid": "000000000000000000000001" diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml similarity index 86% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml index 3f4321a0f26..27187bae63e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMaster error beforeHandshakeCompletes +description: Stale generation NotPrimaryNoSecondaryOk error beforeHandshakeCompletes uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMaster error (stale generation) +- description: Ignore stale NotPrimaryNoSecondaryOk error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,8 +81,8 @@ phases: type: command response: ok: 0 - errmsg: NotMaster - code: 10107 + errmsg: NotPrimaryNoSecondaryOk + code: 13435 topologyVersion: processId: "$oid": '000000000000000000000001' diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.json similarity index 91% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.json index eced40c59c6..58cefafae9e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMasterOrSecondary error beforeHandshakeCompletes", + "description": "Stale generation NotPrimaryOrSecondary error beforeHandshakeCompletes", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMasterOrSecondary error (stale generation)", + "description": "Ignore stale NotPrimaryOrSecondary error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,7 +136,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml similarity index 87% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml index 2462deba85f..1b56fd2ab71 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMasterOrSecondary error beforeHandshakeCompletes +description: Stale generation NotPrimaryOrSecondary error beforeHandshakeCompletes uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMasterOrSecondary error (stale generation) +- description: Ignore stale NotPrimaryOrSecondary error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,7 +81,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.json similarity index 92% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.json index bb7946aca34..c92b01e0540 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Stale generation NotMasterNoSlaveOk error beforeHandshakeCompletes", + "description": "Stale generation NotWritablePrimary error beforeHandshakeCompletes", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -124,7 +126,7 @@ } }, { - "description": "Ignore stale NotMasterNoSlaveOk error (stale generation)", + "description": "Ignore stale NotWritablePrimary error (stale generation)", "applicationErrors": [ { "address": "a:27017", @@ -134,8 +136,8 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", - "code": 13435, + "errmsg": "NotWritablePrimary", + "code": 10107, "topologyVersion": { "processId": { "$oid": "000000000000000000000001" diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml similarity index 87% rename from test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml index 98c1609a44e..725dc172de8 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale generation NotMasterNoSlaveOk error beforeHandshakeCompletes +description: Stale generation NotWritablePrimary error beforeHandshakeCompletes uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -70,7 +72,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMasterNoSlaveOk error (stale generation) +- description: Ignore stale NotWritablePrimary error (stale generation) applicationErrors: - address: a:27017 generation: 0 @@ -79,8 +81,8 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk - code: 13435 + errmsg: NotWritablePrimary + code: 10107 topologyVersion: processId: "$oid": '000000000000000000000001' diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.json index d33dc98db3e..62759b6ad90 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml index 7327ffb8a96..cac86fa7eef 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.json index ee38cc8bbe6..4661632c4f3 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml index fd7039ca9fe..dd3ca671b37 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json index 3e581773eb1..15b044fc73d 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.yml index 997fb76ac51..b6785348266 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-network.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json index 24c8c6e5075..acbb9e581e4 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -82,7 +83,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.yml b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.yml index 1f9ae8180b9..d1ba24ba3bb 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation-beforeHandshakeCompletes-timeout.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-generation.yml.template b/test/spec/server-discovery-and-monitoring/errors/stale-generation.yml.template index cd933e840a5..1519796575a 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-generation.yml.template +++ b/test/spec/server-discovery-and-monitoring/errors/stale-generation.yml.template @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -51,7 +52,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.json b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.json index 8449ac63b27..f2207a04d59 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.yml b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.yml index 4ed7cfdb50b..483c48044d2 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedAtShutdown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.json b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.json index 0cdd1727d34..4387451ce6c 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml index 287b1aa51be..5bed83e3da6 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-InterruptedDueToReplStateChange.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json index beee51e6664..8c0cf00f22c 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.yml b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.yml index df0a2ac5fa1..483087a238e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-LegacyNotPrimary.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterNoSlaveOk.json b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.json similarity index 88% rename from test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterNoSlaveOk.json rename to test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.json index e894dae6d89..99a828326ca 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterNoSlaveOk.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.json @@ -1,5 +1,5 @@ { - "description": "Stale topologyVersion NotMasterNoSlaveOk error", + "description": "Stale topologyVersion NotPrimaryNoSecondaryOk error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Ignore stale NotMasterNoSlaveOk error (topologyVersion less)", + "description": "Ignore stale NotPrimaryNoSecondaryOk error (topologyVersion less)", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", + "errmsg": "NotPrimaryNoSecondaryOk", "code": 13435, "topologyVersion": { "processId": { @@ -97,7 +98,7 @@ } }, { - "description": "Ignore stale NotMasterNoSlaveOk error (topologyVersion equal)", + "description": "Ignore stale NotPrimaryNoSecondaryOk error (topologyVersion equal)", "applicationErrors": [ { "address": "a:27017", @@ -106,7 +107,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterNoSlaveOk", + "errmsg": "NotPrimaryNoSecondaryOk", "code": 13435, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterNoSlaveOk.yml b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml similarity index 79% rename from test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterNoSlaveOk.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml index 6bc1c91303e..823bf3ee8e5 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterNoSlaveOk.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryNoSecondaryOk.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale topologyVersion NotMasterNoSlaveOk error +description: Stale topologyVersion NotPrimaryNoSecondaryOk error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMasterNoSlaveOk error (topologyVersion less) +- description: Ignore stale NotPrimaryNoSecondaryOk error (topologyVersion less) applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk + errmsg: NotPrimaryNoSecondaryOk code: 13435 topologyVersion: processId: @@ -46,7 +47,7 @@ phases: "$numberLong": '0' outcome: *outcome -- description: Ignore stale NotMasterNoSlaveOk error (topologyVersion equal) +- description: Ignore stale NotPrimaryNoSecondaryOk error (topologyVersion equal) applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -54,7 +55,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterNoSlaveOk + errmsg: NotPrimaryNoSecondaryOk code: 13435 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterOrSecondary.json b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.json similarity index 89% rename from test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterOrSecondary.json rename to test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.json index 17243c90225..ba2ea87106b 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterOrSecondary.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.json @@ -1,5 +1,5 @@ { - "description": "Stale topologyVersion NotMasterOrSecondary error", + "description": "Stale topologyVersion NotPrimaryOrSecondary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Ignore stale NotMasterOrSecondary error (topologyVersion less)", + "description": "Ignore stale NotPrimaryOrSecondary error (topologyVersion less)", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436, "topologyVersion": { "processId": { @@ -97,7 +98,7 @@ } }, { - "description": "Ignore stale NotMasterOrSecondary error (topologyVersion equal)", + "description": "Ignore stale NotPrimaryOrSecondary error (topologyVersion equal)", "applicationErrors": [ { "address": "a:27017", @@ -106,7 +107,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMasterOrSecondary", + "errmsg": "NotPrimaryOrSecondary", "code": 13436, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterOrSecondary.yml b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml similarity index 79% rename from test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterOrSecondary.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml index 2754014bd29..acee1ec566f 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMasterOrSecondary.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotPrimaryOrSecondary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale topologyVersion NotMasterOrSecondary error +description: Stale topologyVersion NotPrimaryOrSecondary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMasterOrSecondary error (topologyVersion less) +- description: Ignore stale NotPrimaryOrSecondary error (topologyVersion less) applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 topologyVersion: processId: @@ -46,7 +47,7 @@ phases: "$numberLong": '0' outcome: *outcome -- description: Ignore stale NotMasterOrSecondary error (topologyVersion equal) +- description: Ignore stale NotPrimaryOrSecondary error (topologyVersion equal) applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -54,7 +55,7 @@ phases: type: command response: ok: 0 - errmsg: NotMasterOrSecondary + errmsg: NotPrimaryOrSecondary code: 13436 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMaster.json b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.json similarity index 89% rename from test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMaster.json rename to test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.json index 5823d0446fc..8edd317a73e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMaster.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.json @@ -1,5 +1,5 @@ { - "description": "Stale topologyVersion NotMaster error", + "description": "Stale topologyVersion NotWritablePrimary error", "uri": "mongodb://a/?replicaSet=rs", "phases": [ { @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -51,7 +52,7 @@ } }, { - "description": "Ignore stale NotMaster error (topologyVersion less)", + "description": "Ignore stale NotWritablePrimary error (topologyVersion less)", "applicationErrors": [ { "address": "a:27017", @@ -60,7 +61,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", + "errmsg": "NotWritablePrimary", "code": 10107, "topologyVersion": { "processId": { @@ -97,7 +98,7 @@ } }, { - "description": "Ignore stale NotMaster error (topologyVersion equal)", + "description": "Ignore stale NotWritablePrimary error (topologyVersion equal)", "applicationErrors": [ { "address": "a:27017", @@ -106,7 +107,7 @@ "type": "command", "response": { "ok": 0, - "errmsg": "NotMaster", + "errmsg": "NotWritablePrimary", "code": 10107, "topologyVersion": { "processId": { diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMaster.yml b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.yml similarity index 80% rename from test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMaster.yml rename to test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.yml index 82cd97c4ee8..8e126b0cb07 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotMaster.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-NotWritablePrimary.yml @@ -1,12 +1,13 @@ # Autogenerated tests for SDAM error handling, see generate-error-tests.py -description: Stale topologyVersion NotMaster error +description: Stale topologyVersion NotWritablePrimary error uri: mongodb://a/?replicaSet=rs phases: - description: Primary A is discovered responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -29,7 +30,7 @@ phases: logicalSessionTimeoutMinutes: null setName: rs -- description: Ignore stale NotMaster error (topologyVersion less) +- description: Ignore stale NotWritablePrimary error (topologyVersion less) applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -37,7 +38,7 @@ phases: type: command response: ok: 0 - errmsg: NotMaster + errmsg: NotWritablePrimary code: 10107 topologyVersion: processId: @@ -46,7 +47,7 @@ phases: "$numberLong": '0' outcome: *outcome -- description: Ignore stale NotMaster error (topologyVersion equal) +- description: Ignore stale NotWritablePrimary error (topologyVersion equal) applicationErrors: - address: a:27017 when: afterHandshakeCompletes @@ -54,7 +55,7 @@ phases: type: command response: ok: 0 - errmsg: NotMaster + errmsg: NotWritablePrimary code: 10107 topologyVersion: processId: diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.json b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.json index 93d96784190..da8e4755ebe 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.yml b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.yml index 011eb500b8e..c5e8a403b10 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-PrimarySteppedDown.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.json b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.json index 563eb60d9f4..aa252e1dc4f 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.json +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.yml b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.yml index 494384da134..6ad7677cf02 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.yml +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion-ShutdownInProgress.yml @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion.yml.template b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion.yml.template index 40f5ad7774a..f69d440da0e 100644 --- a/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion.yml.template +++ b/test/spec/server-discovery-and-monitoring/errors/stale-topologyVersion.yml.template @@ -6,7 +6,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs diff --git a/test/spec/server-discovery-and-monitoring/errors/write_errors_ignored.json b/test/spec/server-discovery-and-monitoring/errors/write_errors_ignored.json index 6b80673c12d..b588807e08a 100644 --- a/test/spec/server-discovery-and-monitoring/errors/write_errors_ignored.json +++ b/test/spec/server-discovery-and-monitoring/errors/write_errors_ignored.json @@ -9,7 +9,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -62,8 +63,9 @@ "ok": 1, "writeErrors": [ { - "errmsg": "NotMasterNoSlaveOk", - "code": 13435 + "errmsg": "NotPrimaryNoSecondaryOk", + "code": 13435, + "index": 0 } ] } diff --git a/test/spec/server-discovery-and-monitoring/errors/write_errors_ignored.yml b/test/spec/server-discovery-and-monitoring/errors/write_errors_ignored.yml index e5eaf09651b..85f59d97d4d 100644 --- a/test/spec/server-discovery-and-monitoring/errors/write_errors_ignored.yml +++ b/test/spec/server-discovery-and-monitoring/errors/write_errors_ignored.yml @@ -5,7 +5,8 @@ phases: responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 setName: rs @@ -37,5 +38,5 @@ phases: response: ok: 1 writeErrors: - - { errmsg: NotMasterNoSlaveOk, code: 13435 } + - { errmsg: NotPrimaryNoSecondaryOk, code: 13435, index: 0 } outcome: *outcome diff --git a/test/spec/server-discovery-and-monitoring/integration/cancel-server-check.yml b/test/spec/server-discovery-and-monitoring/integration/cancel-server-check.yml index a52d1bea9e4..2a759a84523 100644 --- a/test/spec/server-discovery-and-monitoring/integration/cancel-server-check.yml +++ b/test/spec/server-discovery-and-monitoring/integration/cancel-server-check.yml @@ -34,7 +34,7 @@ tests: # This should: # 1) Mark the server Unknown # 2) Clear the connection pool - # 3) Cancel the in progress isMaster check and close the Monitor + # 3) Cancel the in progress hello or legacy hello check and close the Monitor # connection # 4) The write will be then we retried, server selection will request an # immediate check, and block for ~500ms until the next Monitor check diff --git a/test/spec/server-discovery-and-monitoring/integration/connectTimeoutMS.json b/test/spec/server-discovery-and-monitoring/integration/connectTimeoutMS.json index b75eb585368..36a6dc4507e 100644 --- a/test/spec/server-discovery-and-monitoring/integration/connectTimeoutMS.json +++ b/test/spec/server-discovery-and-monitoring/integration/connectTimeoutMS.json @@ -42,8 +42,8 @@ }, "data": { "failCommands": [ - "isMaster", - "hello" + "hello", + "isMaster" ], "appName": "connectTimeoutMS=0", "blockConnection": true, diff --git a/test/spec/server-discovery-and-monitoring/integration/connectTimeoutMS.yml b/test/spec/server-discovery-and-monitoring/integration/connectTimeoutMS.yml index e32aa6b587d..3ee4d329264 100644 --- a/test/spec/server-discovery-and-monitoring/integration/connectTimeoutMS.yml +++ b/test/spec/server-discovery-and-monitoring/integration/connectTimeoutMS.yml @@ -23,7 +23,7 @@ tests: documents: - _id: 1 - _id: 2 - # Block the next streaming isMaster check for longer than + # Block the next streaming hello check for longer than # heartbeatFrequencyMS to ensure that the connection timeout remains # unlimited. - name: configureFailPoint @@ -33,7 +33,7 @@ tests: configureFailPoint: failCommand mode: { times: 2 } data: - failCommands: ["isMaster", "hello"] + failCommands: ["hello", "isMaster"] appName: connectTimeoutMS=0 blockConnection: true blockTimeMS: 550 diff --git a/test/spec/server-discovery-and-monitoring/integration/isMaster-command-error.json b/test/spec/server-discovery-and-monitoring/integration/hello-command-error.json similarity index 93% rename from test/spec/server-discovery-and-monitoring/integration/isMaster-command-error.json rename to test/spec/server-discovery-and-monitoring/integration/hello-command-error.json index a98fb2644f2..05a93e751c5 100644 --- a/test/spec/server-discovery-and-monitoring/integration/isMaster-command-error.json +++ b/test/spec/server-discovery-and-monitoring/integration/hello-command-error.json @@ -1,11 +1,11 @@ { "runOn": [ { - "minServerVersion": "4.4" + "minServerVersion": "4.9" } ], "database_name": "sdam-tests", - "collection_name": "isMaster-command-error", + "collection_name": "hello-command-error", "data": [], "tests": [ { @@ -17,8 +17,8 @@ }, "data": { "failCommands": [ - "isMaster", - "hello" + "hello", + "isMaster" ], "appName": "commandErrorHandshakeTest", "closeConnection": false, @@ -59,7 +59,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-command-error", + "insert": "hello-command-error", "documents": [ { "_id": 1 @@ -121,8 +121,8 @@ }, "data": { "failCommands": [ - "isMaster", - "hello" + "hello", + "isMaster" ], "appName": "commandErrorCheckTest", "closeConnection": false, @@ -184,7 +184,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-command-error", + "insert": "hello-command-error", "documents": [ { "_id": 1 @@ -201,7 +201,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-command-error", + "insert": "hello-command-error", "documents": [ { "_id": 3 diff --git a/test/spec/server-discovery-and-monitoring/integration/isMaster-command-error.yml b/test/spec/server-discovery-and-monitoring/integration/hello-command-error.yml similarity index 90% rename from test/spec/server-discovery-and-monitoring/integration/isMaster-command-error.yml rename to test/spec/server-discovery-and-monitoring/integration/hello-command-error.yml index e9faf849c36..ae25e4946c5 100644 --- a/test/spec/server-discovery-and-monitoring/integration/isMaster-command-error.yml +++ b/test/spec/server-discovery-and-monitoring/integration/hello-command-error.yml @@ -1,22 +1,22 @@ # Test SDAM error handling. runOn: # failCommand appName requirements - - minServerVersion: "4.4" + - minServerVersion: "4.9" database_name: &database_name "sdam-tests" -collection_name: &collection_name "isMaster-command-error" +collection_name: &collection_name "hello-command-error" data: [] tests: - description: Command error on Monitor handshake # Configure the initial handshake to fail with a command error. - # Use times: 2 so that the RTT isMaster fails as well. + # Use times: 2 so that the RTT hello fails as well. failPoint: configureFailPoint: failCommand mode: { times: 2 } data: - failCommands: ["isMaster", "hello"] + failCommands: ["hello", "isMaster"] appName: commandErrorHandshakeTest closeConnection: false errorCode: 91 # ShutdownInProgress @@ -41,7 +41,7 @@ tests: - _id: 1 - _id: 2 # We cannot assert the server was marked Unknown and pool was cleared an - # exact number of times because the RTT isMaster may or may not have + # exact number of times because the RTT hello may or may not have # triggered this failpoint as well. # - name: assertEventCount # object: testRunner @@ -84,9 +84,9 @@ tests: documents: - _id: 1 - _id: 2 - # Configure the next streaming isMaster check to fail with a command + # Configure the next streaming hello check to fail with a command # error. - # Use times: 2 so that the RTT isMaster is blocked as well. + # Use times: 2 so that the RTT hello is blocked as well. - name: configureFailPoint object: testRunner arguments: @@ -94,7 +94,7 @@ tests: configureFailPoint: failCommand mode: { times: 2 } data: - failCommands: ["isMaster", "hello"] + failCommands: ["hello", "isMaster"] appName: commandErrorCheckTest closeConnection: false blockConnection: true diff --git a/test/spec/server-discovery-and-monitoring/integration/isMaster-network-error.json b/test/spec/server-discovery-and-monitoring/integration/hello-network-error.json similarity index 93% rename from test/spec/server-discovery-and-monitoring/integration/isMaster-network-error.json rename to test/spec/server-discovery-and-monitoring/integration/hello-network-error.json index d09ce0a14c4..b699363923b 100644 --- a/test/spec/server-discovery-and-monitoring/integration/isMaster-network-error.json +++ b/test/spec/server-discovery-and-monitoring/integration/hello-network-error.json @@ -1,11 +1,11 @@ { "runOn": [ { - "minServerVersion": "4.4" + "minServerVersion": "4.9" } ], "database_name": "sdam-tests", - "collection_name": "isMaster-network-error", + "collection_name": "hello-network-error", "data": [], "tests": [ { @@ -17,8 +17,8 @@ }, "data": { "failCommands": [ - "isMaster", - "hello" + "hello", + "isMaster" ], "appName": "networkErrorHandshakeTest", "closeConnection": true @@ -58,7 +58,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-network-error", + "insert": "hello-network-error", "documents": [ { "_id": 1 @@ -120,8 +120,8 @@ }, "data": { "failCommands": [ - "isMaster", - "hello" + "hello", + "isMaster" ], "appName": "networkErrorCheckTest", "closeConnection": true @@ -164,7 +164,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-network-error", + "insert": "hello-network-error", "documents": [ { "_id": 1 @@ -181,7 +181,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-network-error", + "insert": "hello-network-error", "documents": [ { "_id": 3 diff --git a/test/spec/server-discovery-and-monitoring/integration/isMaster-network-error.yml b/test/spec/server-discovery-and-monitoring/integration/hello-network-error.yml similarity index 87% rename from test/spec/server-discovery-and-monitoring/integration/isMaster-network-error.yml rename to test/spec/server-discovery-and-monitoring/integration/hello-network-error.yml index b43390d3852..54c6a3bac3c 100644 --- a/test/spec/server-discovery-and-monitoring/integration/isMaster-network-error.yml +++ b/test/spec/server-discovery-and-monitoring/integration/hello-network-error.yml @@ -1,22 +1,22 @@ -# Test SDAM error handling. +#hello Test SDAM error handling. runOn: # failCommand appName requirements - - minServerVersion: "4.4" + - minServerVersion: "4.9" database_name: &database_name "sdam-tests" -collection_name: &collection_name "isMaster-network-error" +collection_name: &collection_name "hello-network-error" data: [] tests: - description: Network error on Monitor handshake # Configure the initial handshake to fail with a network error. - # Use times: 2 so that the RTT isMaster fails as well. + # Use times: 2 so that the RTT hello fails as well. failPoint: configureFailPoint: failCommand mode: { times: 2 } data: - failCommands: ["isMaster", "hello"] + failCommands: ["hello", "isMaster"] appName: networkErrorHandshakeTest closeConnection: true clientOptions: @@ -40,7 +40,7 @@ tests: - _id: 1 - _id: 2 # We cannot assert the server was marked Unknown and pool was cleared an - # exact number of times because the RTT isMaster may or may not have + # exact number of times because the RTT hello may or may not have # triggered this failpoint as well. # - name: assertEventCount # object: testRunner @@ -83,9 +83,9 @@ tests: documents: - _id: 1 - _id: 2 - # Configure the next streaming isMaster check to fail with a non-timeout + # Configure the next streaming hello check to fail with a non-timeout # network error. Use times: 2 to ensure that the the Monitor check fails - # since the RTT isMaster may trigger this failpoint as well. + # since the RTT hello may trigger this failpoint as well. - name: configureFailPoint object: testRunner arguments: @@ -93,7 +93,7 @@ tests: configureFailPoint: failCommand mode: { times: 2 } data: - failCommands: ["isMaster", "hello"] + failCommands: ["hello", "isMaster"] appName: networkErrorCheckTest closeConnection: true # The network error on the next check should mark the server Unknown and @@ -116,7 +116,7 @@ tests: - _id: 3 - _id: 4 # We cannot assert the server was marked Unknown and pool was cleared an - # exact number of times because the RTT isMaster may or may not have + # exact number of times because the RTT hello may or may not have # triggered this failpoint as well. # - name: assertEventCount # object: testRunner diff --git a/test/spec/server-discovery-and-monitoring/integration/isMaster-timeout.json b/test/spec/server-discovery-and-monitoring/integration/hello-timeout.json similarity index 95% rename from test/spec/server-discovery-and-monitoring/integration/isMaster-timeout.json rename to test/spec/server-discovery-and-monitoring/integration/hello-timeout.json index d37e7ee6870..7bdc61a9126 100644 --- a/test/spec/server-discovery-and-monitoring/integration/isMaster-timeout.json +++ b/test/spec/server-discovery-and-monitoring/integration/hello-timeout.json @@ -5,7 +5,7 @@ } ], "database_name": "sdam-tests", - "collection_name": "isMaster-timeout", + "collection_name": "hello-timeout", "data": [], "tests": [ { @@ -17,8 +17,8 @@ }, "data": { "failCommands": [ - "isMaster", - "hello" + "hello", + "isMaster" ], "appName": "timeoutMonitorHandshakeTest", "blockConnection": true, @@ -59,7 +59,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-timeout", + "insert": "hello-timeout", "documents": [ { "_id": 1 @@ -121,8 +121,8 @@ }, "data": { "failCommands": [ - "isMaster", - "hello" + "hello", + "isMaster" ], "appName": "timeoutMonitorCheckTest", "blockConnection": true, @@ -182,7 +182,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-timeout", + "insert": "hello-timeout", "documents": [ { "_id": 1 @@ -199,7 +199,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-timeout", + "insert": "hello-timeout", "documents": [ { "_id": 3 @@ -298,7 +298,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-timeout", + "insert": "hello-timeout", "documents": [ { "_id": 1 @@ -315,7 +315,7 @@ { "command_started_event": { "command": { - "insert": "isMaster-timeout", + "insert": "hello-timeout", "documents": [ { "_id": 3 diff --git a/test/spec/server-discovery-and-monitoring/integration/isMaster-timeout.yml b/test/spec/server-discovery-and-monitoring/integration/hello-timeout.yml similarity index 93% rename from test/spec/server-discovery-and-monitoring/integration/isMaster-timeout.yml rename to test/spec/server-discovery-and-monitoring/integration/hello-timeout.yml index b77e37ba120..6c91ca9a720 100644 --- a/test/spec/server-discovery-and-monitoring/integration/isMaster-timeout.yml +++ b/test/spec/server-discovery-and-monitoring/integration/hello-timeout.yml @@ -4,19 +4,19 @@ runOn: - minServerVersion: "4.4" database_name: &database_name "sdam-tests" -collection_name: &collection_name "isMaster-timeout" +collection_name: &collection_name "hello-timeout" data: [] tests: - description: Network timeout on Monitor handshake # Configure the initial handshake to fail with a timeout. - # Use times: 2 so that the RTT isMaster is blocked as well. + # Use times: 2 so that the RTT hello is blocked as well. failPoint: configureFailPoint: failCommand mode: { times: 2 } data: - failCommands: ["isMaster", "hello"] + failCommands: ["hello", "isMaster"] appName: timeoutMonitorHandshakeTest blockConnection: true blockTimeMS: 1000 @@ -41,7 +41,7 @@ tests: - _id: 1 - _id: 2 # We cannot assert the server was marked Unknown and pool was cleared an - # exact number of times because the RTT isMaster may or may not have + # exact number of times because the RTT hello may or may not have # triggered this failpoint as well. # - name: assertEventCount # object: testRunner @@ -84,8 +84,8 @@ tests: documents: - _id: 1 - _id: 2 - # Configure the next streaming isMaster check to fail with a timeout - # Use times: 2 so that the RTT isMaster is blocked as well. + # Configure the next streaming hello check to fail with a timeout + # Use times: 2 so that the RTT hello is blocked as well. - name: configureFailPoint object: testRunner arguments: @@ -93,7 +93,7 @@ tests: configureFailPoint: failCommand mode: { times: 2 } data: - failCommands: ["isMaster", "hello"] + failCommands: ["hello", "isMaster"] appName: timeoutMonitorCheckTest blockConnection: true # blockTimeMS is evaluated after the waiting for heartbeatFrequencyMS server-side, so this value only diff --git a/test/spec/server-discovery-and-monitoring/integration/minPoolSize-error.json b/test/spec/server-discovery-and-monitoring/integration/minPoolSize-error.json index 66f310ce72e..9f8e4f6f8be 100644 --- a/test/spec/server-discovery-and-monitoring/integration/minPoolSize-error.json +++ b/test/spec/server-discovery-and-monitoring/integration/minPoolSize-error.json @@ -17,8 +17,8 @@ }, "data": { "failCommands": [ - "isMaster", - "hello" + "hello", + "isMaster" ], "appName": "SDAMminPoolSizeError", "closeConnection": true diff --git a/test/spec/server-discovery-and-monitoring/integration/minPoolSize-error.yml b/test/spec/server-discovery-and-monitoring/integration/minPoolSize-error.yml index 5715f12f23a..32727288931 100644 --- a/test/spec/server-discovery-and-monitoring/integration/minPoolSize-error.yml +++ b/test/spec/server-discovery-and-monitoring/integration/minPoolSize-error.yml @@ -16,7 +16,7 @@ tests: configureFailPoint: failCommand mode: { skip: 3 } data: - failCommands: ["isMaster", "hello"] + failCommands: ["hello", "isMaster"] appName: SDAMminPoolSizeError closeConnection: true clientOptions: diff --git a/test/spec/server-discovery-and-monitoring/integration/pool-cleared-error.json b/test/spec/server-discovery-and-monitoring/integration/pool-cleared-error.json index 061503c2599..52456f9e133 100644 --- a/test/spec/server-discovery-and-monitoring/integration/pool-cleared-error.json +++ b/test/spec/server-discovery-and-monitoring/integration/pool-cleared-error.json @@ -128,7 +128,7 @@ "name": "runOnThread", "object": "testRunner", "arguments": { - "name": "thread2", + "name": "thread3", "operation": { "name": "insertOne", "object": "collection", @@ -144,7 +144,7 @@ "name": "runOnThread", "object": "testRunner", "arguments": { - "name": "thread1", + "name": "thread4", "operation": { "name": "insertOne", "object": "collection", @@ -160,7 +160,7 @@ "name": "runOnThread", "object": "testRunner", "arguments": { - "name": "thread2", + "name": "thread5", "operation": { "name": "insertOne", "object": "collection", @@ -176,7 +176,7 @@ "name": "runOnThread", "object": "testRunner", "arguments": { - "name": "thread2", + "name": "thread6", "operation": { "name": "insertOne", "object": "collection", diff --git a/test/spec/server-discovery-and-monitoring/integration/pool-cleared-error.yml b/test/spec/server-discovery-and-monitoring/integration/pool-cleared-error.yml index 13147fd5b58..f2e1e04b79d 100644 --- a/test/spec/server-discovery-and-monitoring/integration/pool-cleared-error.yml +++ b/test/spec/server-discovery-and-monitoring/integration/pool-cleared-error.yml @@ -95,7 +95,7 @@ tests: - name: runOnThread object: testRunner arguments: - name: thread2 + name: thread3 operation: name: insertOne object: collection @@ -105,7 +105,7 @@ tests: - name: runOnThread object: testRunner arguments: - name: thread1 + name: thread4 operation: name: insertOne object: collection @@ -115,7 +115,7 @@ tests: - name: runOnThread object: testRunner arguments: - name: thread2 + name: thread5 operation: name: insertOne object: collection @@ -125,7 +125,7 @@ tests: - name: runOnThread object: testRunner arguments: - name: thread2 + name: thread6 operation: name: insertOne object: collection 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 c3ab59834ff..caf31b3391b 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.json +++ b/test/spec/server-discovery-and-monitoring/monitoring/discovered_standalone.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 4 } 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 ad4ab14c31f..0ad4462b9c0 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, ismaster: true, minWireVersion: 0, maxWireVersion: 4 } + - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 4 } 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 33010d49fb9..768aa7a3e19 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "setVersion": 1, 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 ed992f849cd..8a49869f60b 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 @@ -7,7 +7,8 @@ phases: - "a:27017" - ok: 1 - ismaster: false + helloOk: true + isWritablePrimary: false secondary: true setName: "rs" setVersion: 1 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 04caeba652e..da66403541e 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "setVersion": 1, "primary": "a:27017", 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 e42735d41ca..016240f49d7 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 @@ -7,7 +7,8 @@ phases: - "a:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true setName: "rs" setVersion: 1 primary: "a:27017" 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 3cad92d6b8f..16941021a3c 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 @@ -60,7 +60,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "setVersion": 1, "primary": "a:27017", @@ -75,7 +76,8 @@ "b:27017", { "ok": 1, - "ismaster": true + "helloOk": true, + "isWritablePrimary": true } ] ], 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 754d8270e6b..e2277abd32a 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 @@ -43,7 +43,8 @@ phases: - "a:27017" - { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", setVersion: 1.0, primary: "a:27017", @@ -53,7 +54,7 @@ phases: } - - "b:27017" - - { ok: 1, ismaster: true } + - { ok: 1, helloOk: true, isWritablePrimary: true } outcome: events: - 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 0f64bde1183..1d5237058fd 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "setVersion": 1, "primary": "a:27017", 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 32678a6bbed..4463967668c 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 @@ -7,7 +7,8 @@ phases: - "a:27017" - { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", setVersion: 1.0, primary: "a:27017", diff --git a/test/spec/server-discovery-and-monitoring/monitoring/standalone.json b/test/spec/server-discovery-and-monitoring/monitoring/standalone.json index 3ff10f820fc..aeb8aaed358 100644 --- a/test/spec/server-discovery-and-monitoring/monitoring/standalone.json +++ b/test/spec/server-discovery-and-monitoring/monitoring/standalone.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 4 } diff --git a/test/spec/server-discovery-and-monitoring/monitoring/standalone.yml b/test/spec/server-discovery-and-monitoring/monitoring/standalone.yml index 8787edce341..780a032a13b 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, ismaster: true, minWireVersion: 0, maxWireVersion: 4 } + - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 4 } 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 ceab1449cc7..d8cd00c4ea3 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 4 } @@ -17,7 +18,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 4 } 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 229f8d7c69d..00c2e770b9b 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, ismaster: true, minWireVersion: 0, maxWireVersion: 4 } + - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 4 } - - "a:27017" - - { ok: 1, ismaster: true, minWireVersion: 0, maxWireVersion: 4 } + - { ok: 1, helloOk: true, isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 4 } 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 d670770f6d1..444b13e9d57 100644 --- a/test/spec/server-discovery-and-monitoring/rs/compatible.json +++ b/test/spec/server-discovery-and-monitoring/rs/compatible.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -22,7 +23,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ diff --git a/test/spec/server-discovery-and-monitoring/rs/compatible.yml b/test/spec/server-discovery-and-monitoring/rs/compatible.yml index 6fade62db94..8b5d9f456ab 100644 --- a/test/spec/server-discovery-and-monitoring/rs/compatible.yml +++ b/test/spec/server-discovery-and-monitoring/rs/compatible.yml @@ -7,7 +7,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, @@ -15,7 +16,8 @@ phases: [ }], ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017"], 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 1105da8764a..cf92dd1ed35 100644 --- a/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.json +++ b/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", 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 b36b69dd4a4..643e8498191 100644 --- a/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.yml +++ b/test/spec/server-discovery-and-monitoring/rs/compatible_unknown.yml @@ -7,7 +7,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, 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 ad337c127a2..53709b0cee9 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], 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 15cd0308d5e..67d29eadb54 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_arbiters.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], arbiters: ["b:27017"], setName: "rs", 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 dc00dca5f00..64fb49f4fcd 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], 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 c9255aa3efb..c7edb52b018 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], arbiters: ["b:27017"], setName: "rs", 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 1e2ca91bcb4..2e24c83e0b7 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_ghost.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_ghost.json @@ -8,7 +8,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, "maxWireVersion": 6 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 9b2ddd6a859..e613f684b46 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_ghost.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_ghost.yml @@ -10,7 +10,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, maxWireVersion: 6 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 df504b6ca4a..cf5fe83a542 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 @@ -8,7 +8,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, "maxWireVersion": 6 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 638301e63e7..75ec3e64a9b 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 @@ -10,7 +10,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, maxWireVersion: 6 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 cb68120eafb..e4a90f1f9cd 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_hidden.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_hidden.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hidden": true, "hosts": [ 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 a54069c338b..64ed1d82b96 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_hidden.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_hidden.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hidden: true, hosts: ["c:27017", "d:27017"], 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 216328dfa5d..04420596f00 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hidden": true, "hosts": [ 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 1b6f41b01fc..614a39d4826 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hidden: true, hosts: ["c:27017", "d:27017"], 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 05922dc51c5..30258409f64 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_passives.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_passives.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -43,7 +44,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "passive": true, "hosts": [ 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 3baed64aa03..637d86d7f15 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_passives.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_passives.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], passives: ["b:27017"], setName: "rs", @@ -46,7 +47,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, passive: true, hosts: ["a:27017"], 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 f9d8c2e032f..266eaa52344 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -43,7 +44,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "passive": true, "hosts": [ 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 6d34516afcc..a5ced995d31 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], passives: ["b:27017"], setName: "rs", @@ -46,7 +47,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, passive: true, hosts: ["a:27017"], 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 b9032144d46..2d1292bbd47 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_primary.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_primary.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", 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 505acfb86f2..eaedf130ba1 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_primary.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_primary.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, 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 6f639b1c7e5..54dfefba5fd 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", 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 330ed20b516..7879701bb25 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, 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 2cf5a5a6dbf..4ab25667f01 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_rsother.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_rsother.json @@ -8,7 +8,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": false, "hosts": [ "c:27017", 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 1f06c78566e..d78e70c5d72 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_rsother.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_rsother.yml @@ -10,7 +10,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: false, hosts: ["c:27017", "d:27017"], setName: "rs", 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 d9420ca5295..e3958d70adb 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hidden": true, "hosts": [ @@ -24,7 +25,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": false, "hosts": [ "c:27017", 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 24f4e302be3..19159d1efe7 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hidden: true, hosts: ["c:27017", "d:27017"], @@ -21,7 +22,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: false, hosts: ["c:27017", "d:27017"], setName: "rs", 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 02123625a70..22325d4e03a 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_secondary.json +++ b/test/spec/server-discovery-and-monitoring/rs/discover_secondary.json @@ -8,7 +8,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ 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 3fdbccb283b..184849d3ff4 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discover_secondary.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discover_secondary.yml @@ -10,7 +10,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017"], 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 3dde3166b41..d903b6444d7 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 @@ -8,7 +8,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ 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 3781d0e42d3..c73a535f691 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 @@ -10,7 +10,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017"], diff --git a/test/spec/server-discovery-and-monitoring/rs/discovery.json b/test/spec/server-discovery-and-monitoring/rs/discovery.json index 57ed568e3b0..50e1269223a 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discovery.json +++ b/test/spec/server-discovery-and-monitoring/rs/discovery.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ @@ -47,7 +48,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "primary": "d:27017", @@ -91,7 +93,8 @@ "d:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "b:27017", @@ -134,7 +137,8 @@ "c:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ diff --git a/test/spec/server-discovery-and-monitoring/rs/discovery.yml b/test/spec/server-discovery-and-monitoring/rs/discovery.yml index fc666a05f3a..30c82e0cef9 100644 --- a/test/spec/server-discovery-and-monitoring/rs/discovery.yml +++ b/test/spec/server-discovery-and-monitoring/rs/discovery.yml @@ -11,7 +11,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017", "c:27017"], @@ -55,7 +56,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", primary: "d:27017", @@ -106,7 +108,8 @@ phases: [ ["d:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["b:27017", "c:27017", "d:27017", "e:27017"], minWireVersion: 0, @@ -156,7 +159,8 @@ phases: [ ["c:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017", "c:27017"], 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 f8d20b350df..17df3207fa8 100644 --- a/test/spec/server-discovery-and-monitoring/rs/equal_electionids.json +++ b/test/spec/server-discovery-and-monitoring/rs/equal_electionids.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -26,7 +27,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" 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 010d9cf9375..48bb683d64e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/equal_electionids.yml +++ b/test/spec/server-discovery-and-monitoring/rs/equal_electionids.yml @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -19,7 +20,8 @@ phases: [ }], ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, 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 a67db57d0cb..4e02304c619 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "b:27017" 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 557286e0b8e..e97fbca05bb 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["b:27017"], minWireVersion: 0, 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 aa582208d6b..f0539cb3373 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.json +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -22,6 +23,7 @@ "b:27017", { "ok": 1, + "helloOk": true, "arbiterOnly": true, "setName": "rs", "hosts": [ 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 e41dbcd6fe0..e4928f191d4 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.yml +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_arbiter.yml @@ -7,7 +7,8 @@ phases: - - "a:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true setName: "rs" hosts: ["a:27017", "b:27017"] minWireVersion: 0 @@ -15,6 +16,7 @@ phases: - - "b:27017" - ok: 1 + helloOk: true arbiterOnly: true setName: "rs" hosts: ["a:27017", "b:27017"] 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 088159c3aba..824e953f906 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.json +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -22,6 +23,7 @@ "b:27017", { "ok": 1, + "helloOk": true, "isreplicaset": true, "minWireVersion": 0, "maxWireVersion": 1 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 fa73ec3ddd9..da1db790fe4 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.yml +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_ghost.yml @@ -7,7 +7,8 @@ phases: - - "a:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true setName: "rs" hosts: ["a:27017", "b:27017"] minWireVersion: 0 @@ -15,6 +16,7 @@ phases: - - "b:27017" - ok: 1 + helloOk: true isreplicaset: true minWireVersion: 0 maxWireVersion: 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 b65d674b42b..6f301ef5de3 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_other.json +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_other.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -22,6 +23,7 @@ "b:27017", { "ok": 1, + "helloOk": true, "hidden": true, "setName": "rs", "hosts": [ 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 848b307ab06..98061c0a1fb 100644 --- a/test/spec/server-discovery-and-monitoring/rs/incompatible_other.yml +++ b/test/spec/server-discovery-and-monitoring/rs/incompatible_other.yml @@ -7,7 +7,8 @@ phases: - - "a:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true setName: "rs" hosts: ["a:27017", "b:27017"] minWireVersion: 0 @@ -15,6 +16,7 @@ phases: - - "b:27017" - ok: 1 + helloOk: true hidden: true setName: "rs" hosts: ["a:27017", "b:27017"] 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 6860742c9e9..96389d3b769 100644 --- a/test/spec/server-discovery-and-monitoring/rs/ls_timeout.json +++ b/test/spec/server-discovery-and-monitoring/rs/ls_timeout.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017", @@ -53,7 +54,8 @@ "d:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, "maxWireVersion": 6 @@ -90,7 +92,8 @@ "e:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "hosts": [ "a:27017", "b:27017", @@ -136,7 +139,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "a:27017", @@ -184,7 +188,8 @@ "c:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "setName": "rs", "hidden": true, "logicalSessionTimeoutMinutes": 1, @@ -226,7 +231,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "a:27017", 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 7690c83a49f..26679f339ed 100644 --- a/test/spec/server-discovery-and-monitoring/rs/ls_timeout.yml +++ b/test/spec/server-discovery-and-monitoring/rs/ls_timeout.yml @@ -8,7 +8,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017", "c:27017", "d:27017", "e:27017"], setName: "rs", logicalSessionTimeoutMinutes: 3, @@ -46,7 +47,8 @@ phases: [ responses: [ ["d:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, maxWireVersion: 6 @@ -82,7 +84,8 @@ phases: [ responses: [ ["e:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, hosts: ["a:27017", "b:27017", "c:27017", "d:27017", "e:27017"], setName: "rs", arbiterOnly: true, @@ -121,7 +124,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["a:27017", "b:27017", "c:27017", "d:27017", "e:27017"], setName: "rs", @@ -162,7 +166,8 @@ phases: [ responses: [ ["c:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, setName: "rs", hidden: true, logicalSessionTimeoutMinutes: 1, @@ -202,7 +207,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["a:27017", "b:27017", "c:27017", "d:27017", "e:27017"], setName: "rs", 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 336acff0236..0e2c2c462ea 100644 --- a/test/spec/server-discovery-and-monitoring/rs/member_reconfig.json +++ b/test/spec/server-discovery-and-monitoring/rs/member_reconfig.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -41,7 +42,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017" 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 a525bd1e66d..37e63bc0597 100644 --- a/test/spec/server-discovery-and-monitoring/rs/member_reconfig.yml +++ b/test/spec/server-discovery-and-monitoring/rs/member_reconfig.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, @@ -46,7 +47,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017"], minWireVersion: 0, 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 a97dfabf52e..0756003a89f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/member_standalone.json +++ b/test/spec/server-discovery-and-monitoring/rs/member_standalone.json @@ -8,7 +8,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } @@ -32,7 +33,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017" 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 8850b9f9b6d..50c0056650f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/member_standalone.yml +++ b/test/spec/server-discovery-and-monitoring/rs/member_standalone.yml @@ -10,7 +10,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 }] @@ -38,7 +39,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017"], minWireVersion: 0, 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 eb73b304bd9..ed1a6245f96 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary.json +++ b/test/spec/server-discovery-and-monitoring/rs/new_primary.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -41,7 +42,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", 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 b7cfd160145..736dd06c5f3 100644 --- a/test/spec/server-discovery-and-monitoring/rs/new_primary.yml +++ b/test/spec/server-discovery-and-monitoring/rs/new_primary.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, @@ -46,7 +47,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, 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 67f314b1edc..ccb3a41f757 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -54,7 +55,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -100,7 +102,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" 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 8467a839556..dfebbd8561f 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 @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -46,7 +47,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -83,7 +85,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, 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 c1ec50c845c..415a0f66aa9 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -54,7 +55,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -100,7 +102,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" 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 fed3840e0b3..3ebc798b61e 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 @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -46,7 +47,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 2, @@ -83,7 +85,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, 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 7be79d2d3c9..d7b19cfe8f1 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -41,7 +42,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], 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 adca8a2d50a..ca6303cda97 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 @@ -11,7 +11,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, @@ -49,7 +50,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "wrong", minWireVersion: 0, 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 907c1651e02..538077ef099 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 @@ -8,6 +8,7 @@ "b:27017", { "ok": 1, + "helloOk": true, "minWireVersion": 0, "maxWireVersion": 6 } 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 7fc4dddf26a..c18b27ee3fa 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 @@ -9,6 +9,7 @@ phases: [ ["b:27017", { ok: 1, + helloOk: true, minWireVersion: 0, maxWireVersion: 6 }] 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 4d0b0ae629b..96a944f0c35 100644 --- a/test/spec/server-discovery-and-monitoring/rs/normalize_case.json +++ b/test/spec/server-discovery-and-monitoring/rs/normalize_case.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "A:27017" 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 f1fdd788305..d8003ee3754 100644 --- a/test/spec/server-discovery-and-monitoring/rs/normalize_case.yml +++ b/test/spec/server-discovery-and-monitoring/rs/normalize_case.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["A:27017"], passives: ["B:27017"], 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 e854e7fb432..ab1720cefc0 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "me": "A:27017", "hosts": [ @@ -51,7 +52,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "me": "B:27017", 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 51700b96a9b..a0df3351a51 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", me: "A:27017", hosts: ["A:27017"], @@ -56,7 +57,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", me: "B:27017", diff --git a/test/spec/server-discovery-and-monitoring/rs/null_election_id.json b/test/spec/server-discovery-and-monitoring/rs/null_election_id.json index 3de0a74e413..62120e84487 100644 --- a/test/spec/server-discovery-and-monitoring/rs/null_election_id.json +++ b/test/spec/server-discovery-and-monitoring/rs/null_election_id.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017", @@ -52,7 +53,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017", @@ -104,7 +106,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017", @@ -151,7 +154,8 @@ "c:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017", diff --git a/test/spec/server-discovery-and-monitoring/rs/null_election_id.yml b/test/spec/server-discovery-and-monitoring/rs/null_election_id.yml index f435d0d2fb7..7de496cd79d 100644 --- a/test/spec/server-discovery-and-monitoring/rs/null_election_id.yml +++ b/test/spec/server-discovery-and-monitoring/rs/null_election_id.yml @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017", "c:27017"], setVersion: 1, setName: "rs", @@ -49,7 +50,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017", "c:27017"], setName: "rs", setVersion: 1, @@ -91,7 +93,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017", "c:27017"], setVersion: 1, setName: "rs", @@ -132,7 +135,8 @@ phases: [ responses: [ ["c:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017", "c:27017"], setName: "rs", setVersion: 1, 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 897120f1fbc..9c54b39856e 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "isreplicaset": true, "minWireVersion": 0, "maxWireVersion": 6 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 e504d76417b..dbf5b9289d9 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, @@ -38,7 +39,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, isreplicaset: true, minWireVersion: 0, maxWireVersion: 6 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 8d4967b7ddb..ac416e57d5f 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 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 ae46051121d..6cdb0771068 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, @@ -38,7 +39,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 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 e35c75f4bc0..a64524d0ca4 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], 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 2f7db8054f5..abcc7fcfe3e 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, 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 d008326123b..bf70ca3014b 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], 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 67a24ec5ba9..00ed1c0a13e 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 @@ -11,7 +11,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, @@ -42,7 +43,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "wrong", minWireVersion: 0, 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 271ca5874e5..3db854f0859 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.json +++ b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], 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 421e1f0ae41..9a49656549a 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.yml +++ b/test/spec/server-discovery-and-monitoring/rs/primary_disconnect.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, 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 59c8faf1805..3a80b150fe3 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -26,7 +27,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -101,7 +103,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -144,7 +147,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -190,7 +194,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "a:27017", 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 eb923201c9f..0d7d294f974 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 @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -19,7 +20,8 @@ phases: [ }], ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -82,7 +84,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -117,7 +120,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -153,7 +157,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["a:27017", "b:27017"], setName: "rs", 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 beb023e4f41..32e03fb7d4b 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -26,7 +27,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -101,7 +103,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -144,7 +147,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -190,7 +194,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "a:27017", 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 86bbdff35bd..41f2f8d7b73 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 @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -19,7 +20,8 @@ phases: [ }], ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 2, @@ -82,7 +84,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -117,7 +120,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 2, @@ -153,7 +157,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["a:27017", "b:27017"], setName: "rs", 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 806fda37c3b..bc02cc95712 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "me": "c:27017", "hosts": [ @@ -39,7 +40,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "me": "b:27017", "hosts": [ "b:27017" 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 9ffa677327c..f5b536c01f4 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 @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, me: "c:27017", hosts: ["b:27017"], @@ -38,7 +39,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, me: "b:27017", hosts: ["b:27017"], setName: "rs", 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 8d18a6971f5..2d2c0f40d8d 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 @@ -26,7 +26,8 @@ "a:27017", "b:27017" ], - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "ok": 1, "setName": "rs", "minWireVersion": 0, 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 7a4b89fae58..c24fd1a990e 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 @@ -17,7 +17,8 @@ phases: hosts: - 'a:27017' - 'b:27017' - ismaster: true + helloOk: true + isWritablePrimary: true ok: 1 setName: rs minWireVersion: 0 diff --git a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json index a9e01987c8e..4c400936594 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json +++ b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.json @@ -12,7 +12,8 @@ "localhost:27017", "localhost:27018" ], - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "primary": "localhost:27017", "me": "a:27017", @@ -47,7 +48,8 @@ "localhost:27017", "localhost:27018" ], - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "primary": "localhost:27017", diff --git a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml index 540e206d454..5b7e92e603a 100644 --- a/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml +++ b/test/spec/server-discovery-and-monitoring/rs/primary_mismatched_me_not_removed.yml @@ -10,12 +10,13 @@ phases: [ "localhost:27017", "localhost:27018" ], - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", primary: "localhost:27017", # me does not match the primary responder's address, but the server # is still added because we don't me mismatch check the primary and all - # servers from a primary ismaster are added to the working server set + # servers from a primary isWritablePrimary are added to the working server set me: "a:27017", minWireVersion: 0, maxWireVersion: 7 @@ -45,7 +46,8 @@ phases: [ "localhost:27017", "localhost:27018" ], - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", primary: "localhost:27017", 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 6ed55ab3d19..ac0d9374f0d 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ @@ -42,7 +43,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -75,7 +77,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -113,7 +116,8 @@ "c:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "primary": "b:27017", 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 719c4447824..de3f528fe9e 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 @@ -11,7 +11,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017"], @@ -49,7 +50,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, @@ -86,7 +88,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017", "c:27017"], minWireVersion: 0, @@ -130,7 +133,8 @@ phases: [ ["c:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", primary: "b:27017", 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 fdb250ffef4..6dbd73dadc1 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -42,7 +43,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "c:27017", "d:27017" 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 0b2d82a05ff..a78982c28e1 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], me: "a:27017", setName: "rs", @@ -46,7 +47,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["c:27017", "d:27017"], me : "c:27017", setName: "rs", 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 eda47871730..cc0691fb8c7 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], 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 4a06ce63c20..d4434522a98 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "wrong", minWireVersion: 0, diff --git a/test/spec/server-discovery-and-monitoring/rs/repeated.json b/test/spec/server-discovery-and-monitoring/rs/repeated.json index 392d4857947..610aeae0ac7 100644 --- a/test/spec/server-discovery-and-monitoring/rs/repeated.json +++ b/test/spec/server-discovery-and-monitoring/rs/repeated.json @@ -1,5 +1,5 @@ { - "description": "Repeated ismaster response must be processed", + "description": "Repeated isWritablePrimary response must be processed", "uri": "mongodb://a,b/?replicaSet=rs", "phases": [ { @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hidden": true, "hosts": [ @@ -45,7 +46,8 @@ "c:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } @@ -72,7 +74,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hidden": true, "hosts": [ @@ -109,7 +112,8 @@ "c:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "c:27017" diff --git a/test/spec/server-discovery-and-monitoring/rs/repeated.yml b/test/spec/server-discovery-and-monitoring/rs/repeated.yml index 141e41c9e20..f651005babe 100644 --- a/test/spec/server-discovery-and-monitoring/rs/repeated.yml +++ b/test/spec/server-discovery-and-monitoring/rs/repeated.yml @@ -1,4 +1,4 @@ -description: Repeated ismaster response must be processed +description: Repeated isWritablePrimary response must be processed uri: "mongodb://a,b/?replicaSet=rs" @@ -8,7 +8,8 @@ phases: - - "a:27017" - ok: 1 - ismaster: false + helloOk: true + isWritablePrimary: false secondary: true hidden: true hosts: ["a:27017", "c:27017"] @@ -35,7 +36,8 @@ phases: - - "c:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true minWireVersion: 0 maxWireVersion: 6 outcome: @@ -55,7 +57,8 @@ phases: - - "a:27017" - ok: 1 - ismaster: false + helloOk: true + isWritablePrimary: false secondary: true hidden: true hosts: ["a:27017", "c:27017"] @@ -82,7 +85,8 @@ phases: - - "c:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: ["a:27017", "c:27017"] setName: "rs" minWireVersion: 0 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 a0f69de486e..3148e1c141f 100644 --- a/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.json +++ b/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } 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 cb15fac812d..87e80bdb319 100644 --- a/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.yml +++ b/test/spec/server-discovery-and-monitoring/rs/replicaset_rsnp.yml @@ -8,7 +8,8 @@ phases: - - "a:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true minWireVersion: 0 maxWireVersion: 6 outcome: 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 dd3562d7fc9..87a66d9e728 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017" @@ -36,7 +37,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ 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 061a8393794..6ec66c87501 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017"], minWireVersion: 0, @@ -40,7 +41,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017"], 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 7d5e7000357..a39855e654a 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -22,7 +23,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ 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 5caca0b9de2..09c75f9c78c 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, @@ -20,7 +21,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["b:27017", "c:27017"], 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 a951da9f8d2..4c1cb011a50 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 @@ -1,5 +1,5 @@ { - "description": "New primary secondary ignore ok equal 0", + "description": "New primary", "uri": "mongodb://a,b/?replicaSet=rs", "phases": [ { @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -22,7 +23,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ 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 e408cd0d3f4..c7e605d662e 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 @@ -1,4 +1,4 @@ -description: "New primary secondary ignore ok equal 0" +description: "New primary" uri: "mongodb://a,b/?replicaSet=rs" @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, @@ -19,7 +20,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017"], 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 769e272a668..6f1b9b59866 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 @@ -27,7 +27,8 @@ "a:27017", "b:27017" ], - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "ok": 1, "setName": "rs", "minWireVersion": 0, 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 be2ace0cf0f..e5f0f9aceb6 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 @@ -20,7 +20,8 @@ phases: hosts: - 'a:27017' - 'b:27017' - ismaster: false + helloOk: true + isWritablePrimary: false ok: 1 setName: rs minWireVersion: 0 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 4c132b633e1..8d2f152f594 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "a:27017" 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 10ae3674f06..0121d631ce4 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["a:27017"], setName: "wrong", 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 73cbab7c5d5..b7ef2d6d6ab 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -41,7 +42,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "a:27017", 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 667d93e38a8..acd471e78ba 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, @@ -46,7 +47,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["a:27017", "b:27017"], setName: "wrong", diff --git a/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.json b/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.json index 0500c6d1575..2f68287f1d5 100644 --- a/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.json +++ b/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -46,7 +47,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" diff --git a/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.yml b/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.yml index 17bf9415ce1..55c841f24bd 100644 --- a/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.yml +++ b/test/spec/server-discovery-and-monitoring/rs/setversion_without_electionid.yml @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 2, @@ -45,7 +46,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, 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 39a4f532ddb..e9075f97f22 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -36,7 +37,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "a:27017" 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 0d38f33e949..9c4140925d5 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 @@ -11,7 +11,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, @@ -43,7 +44,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["a:27017"], setName: "wrong", 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 945145af885..0433d27a368 100644 --- a/test/spec/server-discovery-and-monitoring/rs/too_new.json +++ b/test/spec/server-discovery-and-monitoring/rs/too_new.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -22,7 +23,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ 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 5f185f7a198..52912826beb 100644 --- a/test/spec/server-discovery-and-monitoring/rs/too_new.yml +++ b/test/spec/server-discovery-and-monitoring/rs/too_new.yml @@ -7,7 +7,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, @@ -15,7 +16,8 @@ phases: [ }], ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017"], diff --git a/test/spec/server-discovery-and-monitoring/rs/too_old.json b/test/spec/server-discovery-and-monitoring/rs/too_old.json index 3f9eadc4bca..461d00acc4c 100644 --- a/test/spec/server-discovery-and-monitoring/rs/too_old.json +++ b/test/spec/server-discovery-and-monitoring/rs/too_old.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "hosts": [ "a:27017", @@ -22,7 +23,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "setName": "rs", "hosts": [ diff --git a/test/spec/server-discovery-and-monitoring/rs/too_old.yml b/test/spec/server-discovery-and-monitoring/rs/too_old.yml index faa29ba5968..ab238dbab9b 100644 --- a/test/spec/server-discovery-and-monitoring/rs/too_old.yml +++ b/test/spec/server-discovery-and-monitoring/rs/too_old.yml @@ -5,7 +5,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, setName: "rs", hosts: ["a:27017", "b:27017"], minWireVersion: 0, @@ -13,7 +14,8 @@ phases: [ }], ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, setName: "rs", hosts: ["a:27017", "b:27017"] diff --git a/test/spec/server-discovery-and-monitoring/rs/topology_version_equal.json b/test/spec/server-discovery-and-monitoring/rs/topology_version_equal.json index ba84e059a0c..d3baa13479d 100644 --- a/test/spec/server-discovery-and-monitoring/rs/topology_version_equal.json +++ b/test/spec/server-discovery-and-monitoring/rs/topology_version_equal.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -52,7 +53,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" diff --git a/test/spec/server-discovery-and-monitoring/rs/topology_version_equal.yml b/test/spec/server-discovery-and-monitoring/rs/topology_version_equal.yml index 104194ac840..3ce3bb6050e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/topology_version_equal.yml +++ b/test/spec/server-discovery-and-monitoring/rs/topology_version_equal.yml @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, @@ -37,7 +38,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, diff --git a/test/spec/server-discovery-and-monitoring/rs/topology_version_greater.json b/test/spec/server-discovery-and-monitoring/rs/topology_version_greater.json index afa8108ea20..f296ccee627 100644 --- a/test/spec/server-discovery-and-monitoring/rs/topology_version_greater.json +++ b/test/spec/server-discovery-and-monitoring/rs/topology_version_greater.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -52,7 +53,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -101,7 +103,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "c:27017" @@ -150,7 +153,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "d:27017" @@ -184,7 +188,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "e:27017" diff --git a/test/spec/server-discovery-and-monitoring/rs/topology_version_greater.yml b/test/spec/server-discovery-and-monitoring/rs/topology_version_greater.yml index 4edf99ba8cb..89603d604d5 100644 --- a/test/spec/server-discovery-and-monitoring/rs/topology_version_greater.yml +++ b/test/spec/server-discovery-and-monitoring/rs/topology_version_greater.yml @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, @@ -37,7 +38,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, @@ -70,7 +72,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "c:27017"], setName: "rs", minWireVersion: 0, @@ -103,7 +106,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "d:27017"], setName: "rs", minWireVersion: 0, @@ -135,7 +139,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "e:27017"], setName: "rs", minWireVersion: 0, diff --git a/test/spec/server-discovery-and-monitoring/rs/topology_version_less.json b/test/spec/server-discovery-and-monitoring/rs/topology_version_less.json index ae45f803d44..435337ff25e 100644 --- a/test/spec/server-discovery-and-monitoring/rs/topology_version_less.json +++ b/test/spec/server-discovery-and-monitoring/rs/topology_version_less.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017" ], @@ -52,7 +53,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" diff --git a/test/spec/server-discovery-and-monitoring/rs/topology_version_less.yml b/test/spec/server-discovery-and-monitoring/rs/topology_version_less.yml index 1faac9b9a7e..1c23e7849ea 100644 --- a/test/spec/server-discovery-and-monitoring/rs/topology_version_less.yml +++ b/test/spec/server-discovery-and-monitoring/rs/topology_version_less.yml @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017"], setName: "rs", minWireVersion: 0, @@ -37,7 +38,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, 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 95c7aa9dce2..cc19a961f2c 100644 --- a/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.json +++ b/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.json @@ -8,7 +8,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 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 37d2f09223b..d0d8547f960 100644 --- a/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.yml +++ b/test/spec/server-discovery-and-monitoring/rs/unexpected_mongos.yml @@ -10,7 +10,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 diff --git a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json b/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json index 16225d6b83f..421ff57c8df 100644 --- a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json +++ b/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -54,7 +55,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -94,7 +96,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" diff --git a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.yml b/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.yml index 003cff44162..300f9d9304b 100644 --- a/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.yml +++ b/test/spec/server-discovery-and-monitoring/rs/use_setversion_without_electionid.yml @@ -9,7 +9,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, @@ -46,7 +47,8 @@ phases: [ responses: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 2, @@ -82,7 +84,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", setVersion: 1, 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 45be2f502b2..9654ff7b79b 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 @@ -8,7 +8,8 @@ "b:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "b:27017", 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 93004e87836..ae75d6f7e44 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 @@ -10,7 +10,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["b:27017", "c:27017"], setName: "wrong", diff --git a/test/spec/server-discovery-and-monitoring/sharded/compatible.json b/test/spec/server-discovery-and-monitoring/sharded/compatible.json index 3dae1f7ea1e..e531db97f9f 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/compatible.json +++ b/test/spec/server-discovery-and-monitoring/sharded/compatible.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 1000 @@ -18,7 +19,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 diff --git a/test/spec/server-discovery-and-monitoring/sharded/compatible.yml b/test/spec/server-discovery-and-monitoring/sharded/compatible.yml index 4e05a0e0aed..06d5182a5cf 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/compatible.yml +++ b/test/spec/server-discovery-and-monitoring/sharded/compatible.yml @@ -5,14 +5,16 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 1000 }], ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 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 427889f8cc2..9e877a0840d 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 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 be12100925e..f44a2970dd2 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 @@ -9,7 +9,8 @@ phases: - "a:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true msg: "isdbgrid" minWireVersion: 0 maxWireVersion: 6 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 96f8dec17ac..93fa398d52e 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "logicalSessionTimeoutMinutes": 1, "minWireVersion": 0, @@ -19,7 +20,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "logicalSessionTimeoutMinutes": 2, "minWireVersion": 0, @@ -49,7 +51,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "logicalSessionTimeoutMinutes": 1, "minWireVersion": 0, @@ -60,7 +63,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 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 8da08da783a..7f78d0d6c6f 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", logicalSessionTimeoutMinutes: 1, minWireVersion: 0, @@ -20,7 +21,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", logicalSessionTimeoutMinutes: 2, minWireVersion: 0, @@ -49,14 +51,15 @@ phases: [ setName: } }, - # Now an ismaster response with no logicalSessionTimeoutMinutes + # Now an isWritablePrimary response with no logicalSessionTimeoutMinutes { responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", logicalSessionTimeoutMinutes: 1, minWireVersion: 0, @@ -66,7 +69,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 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 04015694a8d..50a93eda5ff 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.json +++ b/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 @@ -18,7 +19,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 @@ -70,7 +72,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 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 bb9890b8fec..c4393d85b10 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.yml +++ b/test/spec/server-discovery-and-monitoring/sharded/mongos_disconnect.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 @@ -19,7 +20,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 @@ -79,7 +81,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 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 6e60fd05c7d..311592d715a 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.json +++ b/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 @@ -18,7 +19,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 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 462478c0bd1..0a49d642499 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.yml +++ b/test/spec/server-discovery-and-monitoring/sharded/multiple_mongoses.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 @@ -19,7 +20,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 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 58cf7c07d78..d74375ebbfd 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 @@ -18,7 +19,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "b:27017" ], 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 476c799705e..ab25349bda8 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 @@ -19,7 +20,8 @@ phases: [ ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["b:27017"], setName: "rs", minWireVersion: 0, diff --git a/test/spec/server-discovery-and-monitoring/sharded/too_new.json b/test/spec/server-discovery-and-monitoring/sharded/too_new.json index 9521e117899..4b997d21639 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/too_new.json +++ b/test/spec/server-discovery-and-monitoring/sharded/too_new.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 999, "maxWireVersion": 1000 @@ -18,7 +19,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid" } ] diff --git a/test/spec/server-discovery-and-monitoring/sharded/too_new.yml b/test/spec/server-discovery-and-monitoring/sharded/too_new.yml index 4e03636879e..7d59cb4305d 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/too_new.yml +++ b/test/spec/server-discovery-and-monitoring/sharded/too_new.yml @@ -5,14 +5,16 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 999, maxWireVersion: 1000 }], ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid" }] ], 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 6bd187f61db..688e1db0f5a 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/too_old.json +++ b/test/spec/server-discovery-and-monitoring/sharded/too_old.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 2, "maxWireVersion": 6 @@ -18,7 +19,8 @@ "b:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid" } ] 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 28700570283..925a8f55b8e 100644 --- a/test/spec/server-discovery-and-monitoring/sharded/too_old.yml +++ b/test/spec/server-discovery-and-monitoring/sharded/too_old.yml @@ -5,14 +5,16 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 2, maxWireVersion: 6 }], ["b:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid" }] ], diff --git a/test/spec/server-discovery-and-monitoring/single/compatible.json b/test/spec/server-discovery-and-monitoring/single/compatible.json index ee6b847ade7..302927598ca 100644 --- a/test/spec/server-discovery-and-monitoring/single/compatible.json +++ b/test/spec/server-discovery-and-monitoring/single/compatible.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } diff --git a/test/spec/server-discovery-and-monitoring/single/compatible.yml b/test/spec/server-discovery-and-monitoring/single/compatible.yml index eff9b73cdda..b84c1388c3c 100644 --- a/test/spec/server-discovery-and-monitoring/single/compatible.yml +++ b/test/spec/server-discovery-and-monitoring/single/compatible.yml @@ -5,7 +5,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 }] 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 afd5edc1d21..90676a8f9b0 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "b:27017" ], 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 1b3a8db70bc..18c01226a9a 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["b:27017"], # Internal IP. setName: "rs", minWireVersion: 0, 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 9175049cc64..25fe9651856 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "msg": "isdbgrid", "minWireVersion": 0, "maxWireVersion": 6 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 1253bbcc8d4..853ce57c17e 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, msg: "isdbgrid", minWireVersion: 0, maxWireVersion: 6 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 c629a709bee..cd8660888a0 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "setName": "rs", "minWireVersion": 0, "maxWireVersion": 6 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 25418e66e1a..21e565fd9cb 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 @@ -8,7 +8,8 @@ phases: - - "a:27017" - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true setName: rs minWireVersion: 0 maxWireVersion: 6 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 b07beb31ed2..e2049560566 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "arbiterOnly": true, "hosts": [ "a:27017", 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 c531aab5e51..7e262c9dbe8 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, arbiterOnly: true, hosts: ["a:27017", "b:27017"], setName: "rs", 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 7216a13345e..409e8502b3c 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" 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 0aea56e12b7..4ea0b1551fe 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, hosts: ["a:27017", "b:27017"], setName: "rs", minWireVersion: 0, 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 573036f2aae..305f283b527 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": false, + "helloOk": true, + "isWritablePrimary": false, "secondary": true, "hosts": [ "a:27017", 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 6cd3e5909a0..b0c4d1f2181 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + helloOk: true, + isWritablePrimary: false, secondary: true, hosts: ["a:27017", "b:27017"], setName: "rs", 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 c53d76e76e5..b47278482a7 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } 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 7ad5f590b85..cd71087e4d6 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 }] 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 de0b4b2aa73..71080e6810e 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" @@ -36,7 +37,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "hosts": [ "a:27017", "b:27017" 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 718b0229d16..f1e48dc4194 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 @@ -4,7 +4,8 @@ phases: - responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 - b:27017 @@ -21,7 +22,8 @@ phases: - responses: - - a:27017 - ok: 1 - ismaster: true + helloOk: true + isWritablePrimary: true hosts: - a:27017 - b: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 eb6c6ae7469..858cbdaf638 100644 --- a/test/spec/server-discovery-and-monitoring/single/discover_standalone.json +++ b/test/spec/server-discovery-and-monitoring/single/discover_standalone.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } 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 5071033b8ea..49ebb142091 100644 --- a/test/spec/server-discovery-and-monitoring/single/discover_standalone.yml +++ b/test/spec/server-discovery-and-monitoring/single/discover_standalone.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 }] 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 ae6c8ba11be..87b3e4e8a10 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "logicalSessionTimeoutMinutes": 7, "minWireVersion": 0, "maxWireVersion": 6 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 d0273db6cd3..2926d95a9dd 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 @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, logicalSessionTimeoutMinutes: 7, minWireVersion: 0, maxWireVersion: 6 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 06f71305dc0..8e7c2a10e37 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 @@ -1,5 +1,5 @@ { - "description": "Handle a not-ok ismaster response", + "description": "Handle a not-ok isWritablePrimary response", "uri": "mongodb://a", "phases": [ { @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } @@ -17,7 +18,8 @@ "a:27017", { "ok": 0, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } 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 6d49cca9c21..64103a59024 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 @@ -1,4 +1,4 @@ -description: "Handle a not-ok ismaster response" +description: "Handle a not-ok isWritablePrimary response" uri: "mongodb://a" @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 }], @@ -18,7 +19,8 @@ phases: [ ["a:27017", { ok: 0, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 }] 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 4c363ffffb8..57f8f861b18 100644 --- a/test/spec/server-discovery-and-monitoring/single/standalone_removed.json +++ b/test/spec/server-discovery-and-monitoring/single/standalone_removed.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } 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 ff8c64f5330..59b44b162e7 100644 --- a/test/spec/server-discovery-and-monitoring/single/standalone_removed.yml +++ b/test/spec/server-discovery-and-monitoring/single/standalone_removed.yml @@ -10,7 +10,8 @@ phases: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 }] diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_slave.json b/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json similarity index 79% rename from test/spec/server-discovery-and-monitoring/single/direct_connection_slave.json rename to test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json index 720ec3dd82d..46660fa8de5 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_slave.json +++ b/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.json @@ -1,6 +1,6 @@ { - "description": "Direct connection to slave", - "uri": "mongodb://a/?directConnection=true", + "description": "Connect to standalone using legacy hello", + "uri": "mongodb://a", "phases": [ { "responses": [ @@ -8,7 +8,7 @@ "a:27017", { "ok": 1, - "ismaster": false, + "ismaster": true, "minWireVersion": 0, "maxWireVersion": 6 } diff --git a/test/spec/server-discovery-and-monitoring/single/direct_connection_slave.yml b/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml similarity index 80% rename from test/spec/server-discovery-and-monitoring/single/direct_connection_slave.yml rename to test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml index 7c2436db165..a18ecb70fc3 100644 --- a/test/spec/server-discovery-and-monitoring/single/direct_connection_slave.yml +++ b/test/spec/server-discovery-and-monitoring/single/standalone_using_legacy_hello.yml @@ -1,6 +1,6 @@ -description: "Direct connection to slave" +description: "Connect to standalone using legacy hello" -uri: "mongodb://a/?directConnection=true" +uri: "mongodb://a" phases: [ @@ -10,7 +10,7 @@ phases: [ ["a:27017", { ok: 1, - ismaster: false, + ismaster: true, minWireVersion: 0, maxWireVersion: 6 }] diff --git a/test/spec/server-discovery-and-monitoring/single/too_new.json b/test/spec/server-discovery-and-monitoring/single/too_new.json index 38e4621d60f..8dd57d33483 100644 --- a/test/spec/server-discovery-and-monitoring/single/too_new.json +++ b/test/spec/server-discovery-and-monitoring/single/too_new.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 999, "maxWireVersion": 1000 } diff --git a/test/spec/server-discovery-and-monitoring/single/too_new.yml b/test/spec/server-discovery-and-monitoring/single/too_new.yml index 2c295c54063..b176660d96f 100644 --- a/test/spec/server-discovery-and-monitoring/single/too_new.yml +++ b/test/spec/server-discovery-and-monitoring/single/too_new.yml @@ -5,7 +5,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 999, maxWireVersion: 1000 }] diff --git a/test/spec/server-discovery-and-monitoring/single/too_old.json b/test/spec/server-discovery-and-monitoring/single/too_old.json index fbf68262c02..8c027e01db6 100644 --- a/test/spec/server-discovery-and-monitoring/single/too_old.json +++ b/test/spec/server-discovery-and-monitoring/single/too_old.json @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true + "helloOk": true, + "isWritablePrimary": true } ] ], diff --git a/test/spec/server-discovery-and-monitoring/single/too_old.yml b/test/spec/server-discovery-and-monitoring/single/too_old.yml index 0035f5b06d3..05cc1dc8f1a 100644 --- a/test/spec/server-discovery-and-monitoring/single/too_old.yml +++ b/test/spec/server-discovery-and-monitoring/single/too_old.yml @@ -5,7 +5,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true + helloOk: true, + isWritablePrimary: true }] ], outcome: { 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 7da46856fb7..58ae7d9de40 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 @@ -8,7 +8,8 @@ "a:27017", { "ok": 1, - "ismaster": true + "helloOk": true, + "isWritablePrimary": true } ] ], @@ -31,7 +32,8 @@ "a:27017", { "ok": 1, - "ismaster": true, + "helloOk": true, + "isWritablePrimary": true, "minWireVersion": 0, "maxWireVersion": 6 } 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 ddf8f8fc476..aed6bae6e05 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 @@ -5,7 +5,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true + helloOk: true, + isWritablePrimary: true }] ], outcome: { @@ -25,7 +26,8 @@ phases: [ responses: [ ["a:27017", { ok: 1, - ismaster: true, + helloOk: true, + isWritablePrimary: true, minWireVersion: 0, maxWireVersion: 6 }] diff --git a/test/unit/sdam/monitoring.test.js b/test/unit/sdam/monitoring.test.js index f32615ad34f..49a24e3f714 100644 --- a/test/unit/sdam/monitoring.test.js +++ b/test/unit/sdam/monitoring.test.js @@ -204,5 +204,40 @@ describe('monitoring', function () { monitor.connect(); }); + + it('should upgrade to hello from legacy hello when initial handshake contains helloOk', function (done) { + const docs = []; + mockServer.setMessageHandler(request => { + const doc = request.document; + docs.push(doc); + if (docs.length === 2) { + expect(docs[0]).to.have.property('ismaster', true); + expect(docs[0]).to.have.property('helloOk', true); + expect(docs[1]).to.have.property('hello', true); + done(); + } else if (doc.ismaster || doc.hello) { + setTimeout( + () => request.reply(Object.assign({ helloOk: true }, mock.DEFAULT_ISMASTER)), + 250 + ); + } + }); + + const server = new MockServer(mockServer.address()); + const monitor = new Monitor(server, {}); + this.defer(() => monitor.close()); + monitor.connect(); + monitor.once('serverHeartbeatSucceeded', () => { + const minHeartbeatFrequencyMS = 500; + setTimeout(() => { + // wait for minHeartbeatFrequencyMS, then request a check and verify another check occurred + monitor.once('serverHeartbeatSucceeded', () => { + monitor.close(); + }); + + monitor.requestCheck(); + }, minHeartbeatFrequencyMS); + }); + }); }); });