diff options
author | Ali Mir <ali.mir@mongodb.com> | 2020-09-16 19:33:30 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-09-28 18:05:55 +0000 |
commit | 93cff71bfc5b28d0724e9c19f52041f249fb854c (patch) | |
tree | ea3de0eecbf90d8f84db5dfe71d5c4138c0224f4 /jstests/replsets/remove1.js | |
parent | f509116d2db0aa550d05c77f385402cd0d1406b4 (diff) | |
download | mongo-93cff71bfc5b28d0724e9c19f52041f249fb854c.tar.gz |
SERVER-50651 Replace occurrences of isMaster command with hello in replsets jstests
Diffstat (limited to 'jstests/replsets/remove1.js')
-rw-r--r-- | jstests/replsets/remove1.js | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/jstests/replsets/remove1.js b/jstests/replsets/remove1.js index b54edd6d7dc..7f0296db749 100644 --- a/jstests/replsets/remove1.js +++ b/jstests/replsets/remove1.js @@ -25,11 +25,11 @@ print("Start set with two nodes"); var replTest = new ReplSetTest({name: name, nodes: 2}); var nodes = replTest.startSet(); replTest.initiate(); -var master = replTest.getPrimary(); +var primary = replTest.getPrimary(); var secondary = replTest.getSecondary(); print("Initial sync"); -master.getDB("foo").bar.baz.insert({x: 1}); +primary.getDB("foo").bar.baz.insert({x: 1}); replTest.awaitReplication(); @@ -49,7 +49,7 @@ assert.eq(secondary.getDB("admin").runCommand({ping: 1}).ok, "we should be connected to the secondary"); try { - master.getDB("admin").runCommand({replSetReconfig: config}); + primary.getDB("admin").runCommand({replSetReconfig: config}); } catch (e) { print(e); } @@ -68,10 +68,10 @@ assert.soon(function() { assert.eq( secondary.getDB("admin").runCommand({ping: 1}).ok, 1, "we aren't connected to the secondary"); -reconnect(master); +reconnect(primary); assert.soon(function() { - var c = master.getDB("local").system.replset.findOne(); + var c = primary.getDB("local").system.replset.findOne(); return c.version == nextVersion; }); @@ -89,15 +89,15 @@ assert.soon(function() { return false; } }); -master = replTest.getPrimary(); +primary = replTest.getPrimary(); // Wait and account for 'newlyAdded' automatic reconfig. nextVersion++; replTest.waitForAllNewlyAddedRemovals(); secondary = replTest.getSecondary(); -printjson(master.getDB("admin").runCommand({replSetGetStatus: 1})); -var newConfig = master.getDB("local").system.replset.findOne(); +printjson(primary.getDB("admin").runCommand({replSetGetStatus: 1})); +var newConfig = primary.getDB("local").system.replset.findOne(); print("newConfig: " + tojson(newConfig)); assert.eq(newConfig.version, nextVersion); @@ -106,27 +106,27 @@ replTest.stop(secondary); assert.soon(function() { try { - return master.getDB("admin").runCommand({isMaster: 1}).secondary; + return primary.getDB("admin").runCommand({hello: 1}).secondary; } catch (e) { - print("trying to get master: " + e); + print("trying to get primary: " + e); } }, "waiting for primary to step down", (60 * 1000), 1000); nextVersion++; config.version = nextVersion; -config.members = config.members.filter(node => node.host == master.host); +config.members = config.members.filter(node => node.host == primary.host); try { - master.getDB("admin").runCommand({replSetReconfig: config, force: true}); + primary.getDB("admin").runCommand({replSetReconfig: config, force: true}); } catch (e) { print(e); } -reconnect(master); +reconnect(primary); assert.soon(function() { - return master.getDB("admin").runCommand({isMaster: 1}).ismaster; + return primary.getDB("admin").runCommand({hello: 1}).isWritablePrimary; }, "waiting for old primary to accept reconfig and step up", (60 * 1000), 1000); -config = master.getDB("local").system.replset.findOne(); +config = primary.getDB("local").system.replset.findOne(); printjson(config); assert.gt(config.version, nextVersion); |