SERVER-30249 wait for the signing keys to be available in mongos at startup

1 files changed, 7 insertions, 3 deletions

diff --git a/src/mongo/client/dbclient.cpp b/src/mongo/client/dbclient.cpp
index 53f48e54c3b..6e95116c13e 100644
--- a/src/mongo/client/dbclient.cpp
+++ b/src/mongo/client/dbclient.cpp
@@ -483,13 +483,17 @@ void DBClientBase::logout(const string& dbname, BSONObj& info) {
     runCommand(dbname, BSON("logout" << 1), info);
 }
 
-BSONObj ismastercmdobj = fromjson("{\"ismaster\":1}");
-
 bool DBClientBase::isMaster(bool& isMaster, BSONObj* info) {
+    BSONObjBuilder bob;
+    bob.append("ismaster", 1);
+    if (WireSpec::instance().isInternalClient) {
+        WireSpec::appendInternalClientWireVersion(WireSpec::instance().outgoing, &bob);
+    }
+
     BSONObj o;
     if (info == 0)
         info = &o;
-    bool ok = runCommand("admin", ismastercmdobj, *info);
+    bool ok = runCommand("admin", bob.obj(), *info);
     isMaster = info->getField("ismaster").trueValue();
     return ok;
 }