SERVER-11220 empty_cluster_init.js longer timeout for long startup hang

2 files changed, 4 insertions, 3 deletions

diff --git a/jstests/sharding/empty_cluster_init.js b/jstests/sharding/empty_cluster_init.js
index adf576dfc1d..7554df18425 100644
--- a/jstests/sharding/empty_cluster_init.js
+++ b/jstests/sharding/empty_cluster_init.js
@@ -33,6 +33,7 @@ for (var i = 0; i < 3; i++) {
 }
 
 // Eventually connect to a mongo host, to be sure that the config upgrade happened
+// (This can take longer on extremely slow bbots or VMs)
 var mongosConn = null;
 assert.soon(function() {
     try {
@@ -44,7 +45,7 @@ assert.soon(function() {
         printjson(e);
         return false;
     }
-});
+}, "Mongos " + mongoses[0].host + " did not start.", 5 * 60 * 1000 );
 
 var version = mongosConn.getCollection("config.version").findOne();
 
@@ -73,7 +74,7 @@ assert.soon(function() {
         printjson(e);
         return false;
     }
-});
+}, "Later mongos " + mongoses[ mongoses.length - 1 ].host + " did not start.", 5 * 60 * 1000 );
 
 // Shut down our mongoses now that we've tested them
 for (var i = 0; i < mongoses.length; i++) {
diff --git a/src/mongo/client/distlock.cpp b/src/mongo/client/distlock.cpp
index 56e8e296d06..a01da6ef378 100644
--- a/src/mongo/client/distlock.cpp
+++ b/src/mongo/client/distlock.cpp
@@ -835,7 +835,7 @@ namespace mongo {
             currLock = conn->findOne( LocksType::ConfigNS , BSON( LocksType::name(_name) ) );
 
             if ( !errMsg.empty() || !err["n"].type() || err["n"].numberInt() < 1 ) {
-                logErrMsgOrWarn("could not acquire lock", lockName, errMsg, "(another update won");
+                logErrMsgOrWarn("could not acquire lock", lockName, errMsg, "(another update won)");
                 *other = currLock;
                 other->getOwned();
                 gotLock = false;