1 files changed, 82 insertions, 85 deletions
diff --git a/jstests/sharding/startup_with_all_configs_down.js b/jstests/sharding/startup_with_all_configs_down.js
index 2dc78e07d76..21fd233944c 100644
--- a/jstests/sharding/startup_with_all_configs_down.js
+++ b/jstests/sharding/startup_with_all_configs_down.js
@@ -11,92 +11,89 @@
 TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
 
 (function() {
-    "use strict";
-
-    /**
-     * Restarts the mongod backing the specified shard instance, without restarting the mongobridge.
-     */
-    function restartShard(shard, waitForConnect) {
-        MongoRunner.stopMongod(shard);
-        shard.restart = true;
-        shard.waitForConnect = waitForConnect;
-        MongoRunner.runMongod(shard);
+"use strict";
+
+/**
+ * Restarts the mongod backing the specified shard instance, without restarting the mongobridge.
+ */
+function restartShard(shard, waitForConnect) {
+    MongoRunner.stopMongod(shard);
+    shard.restart = true;
+    shard.waitForConnect = waitForConnect;
+    MongoRunner.runMongod(shard);
+}
+
+// TODO: SERVER-33830 remove shardAsReplicaSet: false
+var st = new ShardingTest({shards: 2, other: {shardAsReplicaSet: false}});
+
+jsTestLog("Setting up initial data");
+
+for (var i = 0; i < 100; i++) {
+    assert.writeOK(st.s.getDB('test').foo.insert({_id: i}));
+}
+
+assert.commandWorked(st.s0.adminCommand({enableSharding: 'test'}));
+st.ensurePrimaryShard('test', st.shard0.shardName);
+
+assert.commandWorked(st.s0.adminCommand({shardCollection: 'test.foo', key: {_id: 1}}));
+assert.commandWorked(st.s0.adminCommand({split: 'test.foo', find: {_id: 50}}));
+assert.commandWorked(
+    st.s0.adminCommand({moveChunk: 'test.foo', find: {_id: 75}, to: st.shard1.shardName}));
+
+// Make sure the pre-existing mongos already has the routing information loaded into memory
+assert.eq(100, st.s.getDB('test').foo.find().itcount());
+
+jsTestLog("Shutting down all config servers");
+for (var i = 0; i < st._configServers.length; i++) {
+    st.stopConfigServer(i);
+}
+
+jsTestLog("Starting a new mongos when there are no config servers up");
+var newMongosInfo = MongoRunner.runMongos({configdb: st._configDB, waitForConnect: false});
+// The new mongos won't accept any new connections, but it should stay up and continue trying
+// to contact the config servers to finish startup.
+assert.throws(function() {
+    new Mongo(newMongosInfo.host);
+});
+
+jsTestLog("Restarting a shard while there are no config servers up");
+restartShard(st.shard1, false);
+
+jsTestLog("Queries should fail because the shard can't initialize sharding state");
+var error = assert.throws(function() {
+    st.s.getDB('test').foo.find().itcount();
+});
+
+assert(ErrorCodes.ReplicaSetNotFound == error.code || ErrorCodes.ExceededTimeLimit == error.code ||
+       ErrorCodes.HostUnreachable == error.code);
+
+jsTestLog("Restarting the config servers");
+for (var i = 0; i < st._configServers.length; i++) {
+    st.restartConfigServer(i);
+}
+
+print("Sleeping for 60 seconds to let the other shards restart their ReplicaSetMonitors");
+sleep(60000);
+
+jsTestLog("Queries against the original mongos should work again");
+assert.eq(100, st.s.getDB('test').foo.find().itcount());
+
+jsTestLog("Should now be possible to connect to the mongos that was started while the config " +
+          "servers were down");
+var newMongosConn = null;
+var caughtException = null;
+assert.soon(function() {
+    try {
+        newMongosConn = new Mongo(newMongosInfo.host);
+        return true;
+    } catch (e) {
+        caughtException = e;
+        return false;
     }
+}, "Failed to connect to mongos after config servers were restarted: " + tojson(caughtException));
 
-    // TODO: SERVER-33830 remove shardAsReplicaSet: false
-    var st = new ShardingTest({shards: 2, other: {shardAsReplicaSet: false}});
+assert.eq(100, newMongosConn.getDB('test').foo.find().itcount());
 
-    jsTestLog("Setting up initial data");
-
-    for (var i = 0; i < 100; i++) {
-        assert.writeOK(st.s.getDB('test').foo.insert({_id: i}));
-    }
-
-    assert.commandWorked(st.s0.adminCommand({enableSharding: 'test'}));
-    st.ensurePrimaryShard('test', st.shard0.shardName);
-
-    assert.commandWorked(st.s0.adminCommand({shardCollection: 'test.foo', key: {_id: 1}}));
-    assert.commandWorked(st.s0.adminCommand({split: 'test.foo', find: {_id: 50}}));
-    assert.commandWorked(
-        st.s0.adminCommand({moveChunk: 'test.foo', find: {_id: 75}, to: st.shard1.shardName}));
-
-    // Make sure the pre-existing mongos already has the routing information loaded into memory
-    assert.eq(100, st.s.getDB('test').foo.find().itcount());
-
-    jsTestLog("Shutting down all config servers");
-    for (var i = 0; i < st._configServers.length; i++) {
-        st.stopConfigServer(i);
-    }
-
-    jsTestLog("Starting a new mongos when there are no config servers up");
-    var newMongosInfo = MongoRunner.runMongos({configdb: st._configDB, waitForConnect: false});
-    // The new mongos won't accept any new connections, but it should stay up and continue trying
-    // to contact the config servers to finish startup.
-    assert.throws(function() {
-        new Mongo(newMongosInfo.host);
-    });
-
-    jsTestLog("Restarting a shard while there are no config servers up");
-    restartShard(st.shard1, false);
-
-    jsTestLog("Queries should fail because the shard can't initialize sharding state");
-    var error = assert.throws(function() {
-        st.s.getDB('test').foo.find().itcount();
-    });
-
-    assert(ErrorCodes.ReplicaSetNotFound == error.code ||
-           ErrorCodes.ExceededTimeLimit == error.code || ErrorCodes.HostUnreachable == error.code);
-
-    jsTestLog("Restarting the config servers");
-    for (var i = 0; i < st._configServers.length; i++) {
-        st.restartConfigServer(i);
-    }
-
-    print("Sleeping for 60 seconds to let the other shards restart their ReplicaSetMonitors");
-    sleep(60000);
-
-    jsTestLog("Queries against the original mongos should work again");
-    assert.eq(100, st.s.getDB('test').foo.find().itcount());
-
-    jsTestLog("Should now be possible to connect to the mongos that was started while the config " +
-              "servers were down");
-    var newMongosConn = null;
-    var caughtException = null;
-    assert.soon(
-        function() {
-            try {
-                newMongosConn = new Mongo(newMongosInfo.host);
-                return true;
-            } catch (e) {
-                caughtException = e;
-                return false;
-            }
-        },
-        "Failed to connect to mongos after config servers were restarted: " +
-            tojson(caughtException));
-
-    assert.eq(100, newMongosConn.getDB('test').foo.find().itcount());
-
-    st.stop();
-    MongoRunner.stopMongos(newMongosInfo);
+st.stop();
+MongoRunner.stopMongos(newMongosInfo);
 }());