SERVER-23148 patch multi_rs.js to ensure replSetMaintenance command succeeds

(cherry picked from commit ebf68ba0923844afefd6a9e237d478672da5e40d)

1 files changed, 6 insertions, 1 deletions

diff --git a/jstests/multiVersion/libs/multi_rs.js b/jstests/multiVersion/libs/multi_rs.js
index 673be42d3df..da976c7f4dc 100644
--- a/jstests/multiVersion/libs/multi_rs.js
+++ b/jstests/multiVersion/libs/multi_rs.js
@@ -50,7 +50,12 @@ ReplSetTest.prototype.upgradeNode = function(node, opts, user, pwd) {
     var isMaster = node.getDB('admin').runCommand({isMaster: 1});
 
     if (!isMaster.arbiterOnly) {
-        assert.commandWorked(node.adminCommand("replSetMaintenance"));
+        // Must retry this command, as it might return "currently running for election" and fail.
+        // Node might still be running for an election that will fail because it lost the election
+        // race with another node, at test initialization.  See SERVER-23133.
+        assert.soon(function() {
+            return (node.adminCommand("replSetMaintenance").ok);
+        });
         this.waitForState(node, ReplSetTest.State.RECOVERING);
     }