1 files changed, 72 insertions, 83 deletions
diff --git a/jstests/sharding/pending_chunk.js b/jstests/sharding/pending_chunk.js
index 3455699d9e0..21107fe370d 100644
--- a/jstests/sharding/pending_chunk.js
+++ b/jstests/sharding/pending_chunk.js
@@ -2,88 +2,77 @@
 // Tests pending chunk metadata.
 //
 
-(function() { 
-"use strict";
-
-var st = new ShardingTest({ shards: 2, mongos: 2, other: { separateConfig: true } });
-
-var mongos = st.s0;
-var admin = mongos.getDB('admin');
-var shards = mongos.getCollection('config.shards').find().toArray();
-var coll = mongos.getCollection('foo.bar');
-var ns = coll.getFullName();
-var dbName = coll.getDB().getName();
-var shard0 = st.shard0, shard1 = st.shard1;
-
-assert.commandWorked(admin.runCommand({enableSharding: dbName}));
-printjson(admin.runCommand({movePrimary: dbName, to: shards[0]._id}));
-assert.commandWorked(admin.runCommand({shardCollection: ns, key: {_id: 1}}));
-
-jsTest.log('Moving some chunks to shard1...');
-
-assert.commandWorked(admin.runCommand({split: ns, middle: {_id: 0}}));
-assert.commandWorked(admin.runCommand({split: ns, middle: {_id: 1}}));
-assert.commandWorked(admin.runCommand({moveChunk: ns,
-                           find: {_id: 0},
-                           to: shards[1]._id,
-                           _waitForDelete: true}));
-assert.commandWorked(admin.runCommand({moveChunk: ns,
-                           find: {_id: 1},
-                           to: shards[1]._id,
-                           _waitForDelete: true}));
-
-
-function getMetadata(shard) {
-    var admin = shard.getDB('admin'),
-        metadata = admin.runCommand({
-            getShardVersion: ns, fullMetadata: true
-        }).metadata;
-
-    jsTest.log('Got metadata: ' + tojson(metadata));
-    return metadata;
-}
-
-var metadata = getMetadata(shard1);
-assert.eq(metadata.pending[0][0]._id, 1);
-assert.eq(metadata.pending[0][1]._id, MaxKey);
-
-jsTest.log('Moving some chunks back to shard0 after empty...');
-
-assert.commandWorked(admin.runCommand({moveChunk: ns,
-                         find: {_id: -1},
-                         to: shards[1]._id,
-                         _waitForDelete: true}));
-
-metadata = getMetadata(shard0);
-assert.eq(metadata.shardVersion.t, 0);
-assert.neq(metadata.collVersion.t, 0);
-assert.eq(metadata.pending.length, 0);
-
-assert.commandWorked(admin.runCommand({moveChunk: ns,
-                           find: {_id: 1},
-                           to: shards[0]._id,
-                           _waitForDelete: true}));
-
-metadata = getMetadata(shard0);
-assert.eq(metadata.shardVersion.t, 0);
-assert.neq(metadata.collVersion.t, 0);
-assert.eq(metadata.pending[0][0]._id, 1);
-assert.eq(metadata.pending[0][1]._id, MaxKey);
-
-// The pending chunk should be promoted to a real chunk when shard0 reloads
-// its config.
-jsTest.log('Checking that pending chunk is promoted on reload...');
-
-assert.eq(null, coll.findOne({_id: 1}));
-
-metadata = getMetadata(shard0);
-assert.neq(metadata.shardVersion.t, 0);
-assert.neq(metadata.collVersion.t, 0);
-assert.eq(metadata.chunks[0][0]._id, 1);
-assert.eq(metadata.chunks[0][1]._id, MaxKey);
-
-st.printShardingStatus();
-
-st.stop();
+(function() {
+    "use strict";
+
+    var st = new ShardingTest({shards: 2, mongos: 2, other: {separateConfig: true}});
+
+    var mongos = st.s0;
+    var admin = mongos.getDB('admin');
+    var shards = mongos.getCollection('config.shards').find().toArray();
+    var coll = mongos.getCollection('foo.bar');
+    var ns = coll.getFullName();
+    var dbName = coll.getDB().getName();
+    var shard0 = st.shard0, shard1 = st.shard1;
+
+    assert.commandWorked(admin.runCommand({enableSharding: dbName}));
+    printjson(admin.runCommand({movePrimary: dbName, to: shards[0]._id}));
+    assert.commandWorked(admin.runCommand({shardCollection: ns, key: {_id: 1}}));
+
+    jsTest.log('Moving some chunks to shard1...');
+
+    assert.commandWorked(admin.runCommand({split: ns, middle: {_id: 0}}));
+    assert.commandWorked(admin.runCommand({split: ns, middle: {_id: 1}}));
+    assert.commandWorked(admin.runCommand(
+        {moveChunk: ns, find: {_id: 0}, to: shards[1]._id, _waitForDelete: true}));
+    assert.commandWorked(admin.runCommand(
+        {moveChunk: ns, find: {_id: 1}, to: shards[1]._id, _waitForDelete: true}));
+
+    function getMetadata(shard) {
+        var admin = shard.getDB('admin'),
+            metadata = admin.runCommand({getShardVersion: ns, fullMetadata: true}).metadata;
+
+        jsTest.log('Got metadata: ' + tojson(metadata));
+        return metadata;
+    }
+
+    var metadata = getMetadata(shard1);
+    assert.eq(metadata.pending[0][0]._id, 1);
+    assert.eq(metadata.pending[0][1]._id, MaxKey);
+
+    jsTest.log('Moving some chunks back to shard0 after empty...');
+
+    assert.commandWorked(admin.runCommand(
+        {moveChunk: ns, find: {_id: -1}, to: shards[1]._id, _waitForDelete: true}));
+
+    metadata = getMetadata(shard0);
+    assert.eq(metadata.shardVersion.t, 0);
+    assert.neq(metadata.collVersion.t, 0);
+    assert.eq(metadata.pending.length, 0);
+
+    assert.commandWorked(admin.runCommand(
+        {moveChunk: ns, find: {_id: 1}, to: shards[0]._id, _waitForDelete: true}));
+
+    metadata = getMetadata(shard0);
+    assert.eq(metadata.shardVersion.t, 0);
+    assert.neq(metadata.collVersion.t, 0);
+    assert.eq(metadata.pending[0][0]._id, 1);
+    assert.eq(metadata.pending[0][1]._id, MaxKey);
+
+    // The pending chunk should be promoted to a real chunk when shard0 reloads
+    // its config.
+    jsTest.log('Checking that pending chunk is promoted on reload...');
+
+    assert.eq(null, coll.findOne({_id: 1}));
+
+    metadata = getMetadata(shard0);
+    assert.neq(metadata.shardVersion.t, 0);
+    assert.neq(metadata.collVersion.t, 0);
+    assert.eq(metadata.chunks[0][0]._id, 1);
+    assert.eq(metadata.chunks[0][1]._id, MaxKey);
+
+    st.printShardingStatus();
+
+    st.stop();
 
 })();