1 files changed, 60 insertions, 67 deletions
diff --git a/jstests/sharding/query_after_multi_write.js b/jstests/sharding/query_after_multi_write.js
index 74867dfd970..a952484435c 100644
--- a/jstests/sharding/query_after_multi_write.js
+++ b/jstests/sharding/query_after_multi_write.js
@@ -1,70 +1,63 @@
 (function() {
-"use strict";
-
-/**
- * Test that queries will be properly routed after executing a write that does not
- * perform any shard version checks.
- */
-var runTest = function(writeFunc) {
-    var st = new ShardingTest({ shards: 2, mongos: 2 });
-
-    var testDB = st.s.getDB('test');
-    testDB.dropDatabase();
-
-    assert.commandWorked(testDB.adminCommand({ enableSharding: 'test' }));
-    st.ensurePrimaryShard('test', 'shard0000');
-
-    assert.commandWorked(testDB.adminCommand({ shardCollection: 'test.user', key: { x: 1 }}));
-    assert.commandWorked(testDB.adminCommand({ split: 'test.user', middle: { x: 0 }}));
-    assert.commandWorked(testDB.adminCommand({ moveChunk: 'test.user',
-                                               find: { x: 0 },
-                                               to: 'shard0001',
-                                               _waitForDelete: true }));
-
-    var testDB2 = st.s1.getDB('test');
-    testDB2.user.insert({ x: 123456 });
-
-    // Move chunk to bump version on a different mongos.
-    assert.commandWorked(testDB.adminCommand({ moveChunk: 'test.user',
-                                               find: { x: 0 },
-                                               to: 'shard0000',
-                                               _waitForDelete: true }));
-
-    // Issue a query and make sure it gets routed to the right shard.
-    assert.neq(null, testDB2.user.findOne({ x: 123456 }));
-
-    // At this point, s1 thinks the version of 'test.user' is 2, bounce it again so it gets
-    // incremented to 3
-    assert.commandWorked(testDB.adminCommand({ moveChunk: 'test.user',
-                                               find: { x: 0 },
-                                               to: 'shard0001',
-                                               _waitForDelete: true }));
-
-    // Issue a query and make sure it gets routed to the right shard again.
-    assert.neq(null, testDB2.user.findOne({ x: 123456 }));
-
-    // At this point, s0 thinks the version of 'test.user' is 3, bounce it again so it gets
-    // incremented to 4
-    assert.commandWorked(testDB.adminCommand({ moveChunk: 'test.user',
-                                               find: { x: 0 },
-                                               to: 'shard0000',
-                                               _waitForDelete: true }));
-
-    // Ensure that write commands with multi version do not reset the connection shard version to
-    // ignored.
-    writeFunc(testDB2);
-
-    assert.neq(null, testDB2.user.findOne({ x: 123456 }));
-
-    st.stop();
-};
-
-runTest(function(db) {
-    db.user.update({}, { $inc: { y: 987654 }}, false, true);
-});
-
-runTest(function(db) {
-    db.user.remove({ y: 'noMatch' }, false);
-});
+    "use strict";
+
+    /**
+     * Test that queries will be properly routed after executing a write that does not
+     * perform any shard version checks.
+     */
+    var runTest = function(writeFunc) {
+        var st = new ShardingTest({shards: 2, mongos: 2});
+
+        var testDB = st.s.getDB('test');
+        testDB.dropDatabase();
+
+        assert.commandWorked(testDB.adminCommand({enableSharding: 'test'}));
+        st.ensurePrimaryShard('test', 'shard0000');
+
+        assert.commandWorked(testDB.adminCommand({shardCollection: 'test.user', key: {x: 1}}));
+        assert.commandWorked(testDB.adminCommand({split: 'test.user', middle: {x: 0}}));
+        assert.commandWorked(testDB.adminCommand(
+            {moveChunk: 'test.user', find: {x: 0}, to: 'shard0001', _waitForDelete: true}));
+
+        var testDB2 = st.s1.getDB('test');
+        testDB2.user.insert({x: 123456});
+
+        // Move chunk to bump version on a different mongos.
+        assert.commandWorked(testDB.adminCommand(
+            {moveChunk: 'test.user', find: {x: 0}, to: 'shard0000', _waitForDelete: true}));
+
+        // Issue a query and make sure it gets routed to the right shard.
+        assert.neq(null, testDB2.user.findOne({x: 123456}));
+
+        // At this point, s1 thinks the version of 'test.user' is 2, bounce it again so it gets
+        // incremented to 3
+        assert.commandWorked(testDB.adminCommand(
+            {moveChunk: 'test.user', find: {x: 0}, to: 'shard0001', _waitForDelete: true}));
+
+        // Issue a query and make sure it gets routed to the right shard again.
+        assert.neq(null, testDB2.user.findOne({x: 123456}));
+
+        // At this point, s0 thinks the version of 'test.user' is 3, bounce it again so it gets
+        // incremented to 4
+        assert.commandWorked(testDB.adminCommand(
+            {moveChunk: 'test.user', find: {x: 0}, to: 'shard0000', _waitForDelete: true}));
+
+        // Ensure that write commands with multi version do not reset the connection shard version
+        // to
+        // ignored.
+        writeFunc(testDB2);
+
+        assert.neq(null, testDB2.user.findOne({x: 123456}));
+
+        st.stop();
+    };
+
+    runTest(function(db) {
+        db.user.update({}, {$inc: {y: 987654}}, false, true);
+    });
+
+    runTest(function(db) {
+        db.user.remove({y: 'noMatch'}, false);
+    });
 
 })();