SERVER-15915 Make isself check block until we're listening for incoming network requests

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mongo/db/repl/isself.cpp b/src/mongo/db/repl/isself.cpp
index 2f4fd1c0f86..130e88df83d 100644
--- a/src/mongo/db/repl/isself.cpp
+++ b/src/mongo/db/repl/isself.cpp
@@ -184,11 +184,12 @@ namespace {
             }
         }
 
-        if (!Listener::getTimeTracker()) {
-            // this ensures we are actually running a server
-            // this may return true later, so may want to retry
+        // Ensure that the server is up and ready to accept incoming network requests.
+        const Listener* listener = Listener::getTimeTracker();
+        if (!listener) {
             return false;
         }
+        listener->waitUntilListening();
 
         try {
             DBClientConnection conn;