SERVER-27461 Retry connecting to shut down primary until failure in shutdown_primary.js

(cherry picked from commit 51995ca347ff3f201b1f316dfbc13940c7b2ea93)

1 files changed, 10 insertions, 4 deletions

diff --git a/jstests/replsets/shutdown_primary.js b/jstests/replsets/shutdown_primary.js
index 0192bc41b49..2299900e21c 100644
--- a/jstests/replsets/shutdown_primary.js
+++ b/jstests/replsets/shutdown_primary.js
@@ -51,12 +51,18 @@
     restartReplSetReplication(replTest);
 
     jsTestLog("Verifying primary shut down and cannot be connected to.");
-    // Successful shutdown throws network error.
+    // Successfully starting shutdown throws a network error.
     var exitCode = awaitShell({checkExitSuccess: false});
     assert.neq(0, exitCode, "expected shutdown to close the shell's connection");
-    assert.throws(function() {
-        new Mongo(primary.host);
-    });
+    assert.soonNoExcept(function() {
+        // The parallel shell exits while shutdown is in progress, and if this happens early enough,
+        // the primary can still accept connections despite successfully starting to shutdown.
+        // So, retry connecting until connections cannot be established and an error is thrown.
+        assert.throws(function() {
+            new Mongo(primary.host);
+        });
+        return true;
+    }, "expected primary node to shut down and not be connectable");
 
     replTest.stopSet();
 })();