SERVER-32803 stepup.js should retry stepUp command

1 files changed, 8 insertions, 3 deletions

diff --git a/jstests/replsets/stepup.js b/jstests/replsets/stepup.js
index ae78921f44b..0e89fc25252 100644
--- a/jstests/replsets/stepup.js
+++ b/jstests/replsets/stepup.js
@@ -46,9 +46,14 @@ load("jstests/replsets/rslib.js");
 
     // Wait for the secondary to catch up by replicating a doc to both nodes.
     assert.writeOK(primary.getDB("test").bar.insert({x: 3}, {writeConcern: {w: "majority"}}));
-    // Step up the secondary and succeed.
-    res = secondary.adminCommand({replSetStepUp: 1});
-    assert.commandWorked(res);
+
+    // Step up the secondary. Retry since the old primary may step down when we try to ask for its
+    // vote.
+    assert.soonNoExcept(function() {
+        return secondary.adminCommand({replSetStepUp: 1}).ok;
+    });
+
+    // Make sure the step up succeeded.
     assert.eq(secondary, rst.getPrimary());
 
 })();