diff options
author | Benety Goh <benety@mongodb.com> | 2017-03-31 15:59:23 -0400 |
---|---|---|
committer | Benety Goh <benety@mongodb.com> | 2017-03-31 15:59:23 -0400 |
commit | aeae03f23b14e29d3c07a65762d57267d6bae0b9 (patch) | |
tree | bf1a0bf2b396d472eca531a9b9c88a6ed15d2a76 /src/mongo | |
parent | 3f8cb1199fe9f7d83725c5f79113beb77758b574 (diff) | |
download | mongo-aeae03f23b14e29d3c07a65762d57267d6bae0b9.tar.gz |
Revert "SERVER-28376 ReplSetTest.stepUp() calls awaitReplication() before sending replSetStepUp command"
This reverts commit 3f8cb1199fe9f7d83725c5f79113beb77758b574.
Diffstat (limited to 'src/mongo')
-rw-r--r-- | src/mongo/shell/replsettest.js | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js index 6741f87911f..aaf866362fc 100644 --- a/src/mongo/shell/replsettest.js +++ b/src/mongo/shell/replsettest.js @@ -136,14 +136,6 @@ var ReplSetTest = function(opts) { return self.liveNodes.master || false; } - function asCluster(conn, fn) { - if (self.keyFile) { - return authutil.asCluster(conn, self.keyFile, fn); - } else { - return fn(); - } - } - /** * Returns 'true' if the test has been configured to run without journaling enabled. */ @@ -773,12 +765,7 @@ var ReplSetTest = function(opts) { */ this.initiateWithNodeZeroAsPrimary = function(cfg, initCmd) { this.initiateWithAnyNodeAsPrimary(cfg, initCmd); - - // stepUp() calls awaitReplication() which requires all nodes to be authorized to run - // replSetGetStatus. - asCluster(this.nodes, function() { - self.stepUp(self.nodes[0]); - }); + this.stepUp(this.nodes[0]); }; /** @@ -797,7 +784,6 @@ var ReplSetTest = function(opts) { */ this.stepUp = function(node) { this.awaitSecondaryNodes(); - this.awaitReplication(); this.awaitNodesAgreeOnPrimary(); if (this.getPrimary() === node) { return; @@ -818,7 +804,6 @@ var ReplSetTest = function(opts) { print("Caught exception while stepping down node '" + tojson(node.host) + "': " + tojson(ex)); } - this.awaitReplication(); this.awaitNodesAgreeOnPrimary(); } |