SERVER-30625 Reconnect connection after waiting for repl state transition in the shell

1 files changed, 6 insertions, 1 deletions

diff --git a/jstests/replsets/rslib.js b/jstests/replsets/rslib.js
index 5403b129b3c..320906321c8 100644
--- a/jstests/replsets/rslib.js
+++ b/jstests/replsets/rslib.js
@@ -275,7 +275,8 @@ var getLastOpTime;
     };
 
     /**
-     * Waits for the given node to reach the given state, ignoring network errors.
+     * Waits for the given node to reach the given state, ignoring network errors.  Ensures that the
+     * connection is re-connected and usable when the function returns.
      */
     waitForState = function(node, state) {
         assert.soonNoExcept(function() {
@@ -283,6 +284,10 @@ var getLastOpTime;
                 {replSetTest: 1, waitForMemberState: state, timeoutMillis: 60 * 1000 * 5}));
             return true;
         });
+        // Some state transitions cause connections to be closed, but whether the connection close
+        // happens before or after the replSetTest command above returns is racy, so to ensure that
+        // the connection to 'node' is usable after this function returns, reconnect it first.
+        reconnect(node);
     };
 
     /**