1 files changed, 103 insertions, 105 deletions
diff --git a/jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js b/jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js
index 8fb97e4aa1a..34a5f8d89fc 100644
--- a/jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js
+++ b/jstests/sharding/cleanup_orphaned_cmd_during_movechunk_hashed.js
@@ -9,121 +9,119 @@ load('./jstests/libs/chunk_manipulation_util.js');
 load('./jstests/libs/cleanup_orphaned_util.js');
 
 (function() {
-    "use strict";
+"use strict";
 
-    var staticMongod = MongoRunner.runMongod({});  // For startParallelOps.
-    var st = new ShardingTest({shards: 2, other: {separateConfig: true}});
+var staticMongod = MongoRunner.runMongod({});  // For startParallelOps.
+var st = new ShardingTest({shards: 2, other: {separateConfig: true}});
 
-    var mongos = st.s0, admin = mongos.getDB('admin'), dbName = 'foo', ns = dbName + '.bar',
-        coll = mongos.getCollection(ns);
+var mongos = st.s0, admin = mongos.getDB('admin'), dbName = 'foo', ns = dbName + '.bar',
+    coll = mongos.getCollection(ns);
 
-    assert.commandWorked(admin.runCommand({enableSharding: dbName}));
-    printjson(admin.runCommand({movePrimary: dbName, to: st.shard0.shardName}));
-    assert.commandWorked(admin.runCommand({shardCollection: ns, key: {key: 'hashed'}}));
+assert.commandWorked(admin.runCommand({enableSharding: dbName}));
+printjson(admin.runCommand({movePrimary: dbName, to: st.shard0.shardName}));
+assert.commandWorked(admin.runCommand({shardCollection: ns, key: {key: 'hashed'}}));
 
-    // Makes four chunks by default, two on each shard.
-    var chunks = st.config.chunks.find({ns: ns}).sort({min: 1}).toArray();
-    assert.eq(4, chunks.length);
+// Makes four chunks by default, two on each shard.
+var chunks = st.config.chunks.find({ns: ns}).sort({min: 1}).toArray();
+assert.eq(4, chunks.length);
 
-    var chunkWithDoc = chunks[1];
-    print('Trying to make doc that hashes to this chunk: ' + tojson(chunkWithDoc));
+var chunkWithDoc = chunks[1];
+print('Trying to make doc that hashes to this chunk: ' + tojson(chunkWithDoc));
 
-    var found = false;
-    for (var i = 0; i < 10000; i++) {
-        var doc = {key: ObjectId()}, hash = mongos.adminCommand({_hashBSONElement: doc.key}).out;
+var found = false;
+for (var i = 0; i < 10000; i++) {
+    var doc = {key: ObjectId()}, hash = mongos.adminCommand({_hashBSONElement: doc.key}).out;
 
-        print('doc.key ' + doc.key + ' hashes to ' + hash);
+    print('doc.key ' + doc.key + ' hashes to ' + hash);
 
-        if (mongos.getCollection('config.chunks')
-                .findOne(
-                    {_id: chunkWithDoc._id, 'min.key': {$lte: hash}, 'max.key': {$gt: hash}})) {
-            found = true;
-            break;
-        }
+    if (mongos.getCollection('config.chunks')
+            .findOne({_id: chunkWithDoc._id, 'min.key': {$lte: hash}, 'max.key': {$gt: hash}})) {
+        found = true;
+        break;
     }
+}
 
-    assert(found, "Couldn't make doc that belongs to chunk 1.");
-    print('Doc: ' + tojson(doc));
-    coll.insert(doc);
-    assert.eq(null, coll.getDB().getLastError());
-
-    //
-    // Start a moveChunk in the background from shard 0 to shard 1. Pause it at
-    // some points in the donor's and recipient's work flows, and test
-    // cleanupOrphaned.
-    //
-
-    var donor, recip;
-    if (chunkWithDoc.shard == st.shard0.shardName) {
-        donor = st.shard0;
-        recip = st.shard1;
-    } else {
-        recip = st.shard0;
-        donor = st.shard1;
-    }
+assert(found, "Couldn't make doc that belongs to chunk 1.");
+print('Doc: ' + tojson(doc));
+coll.insert(doc);
+assert.eq(null, coll.getDB().getLastError());
 
-    jsTest.log('setting failpoint startedMoveChunk (donor) and cloned (recipient)');
-    pauseMoveChunkAtStep(donor, moveChunkStepNames.startedMoveChunk);
-    pauseMigrateAtStep(recip, migrateStepNames.cloned);
-
-    var joinMoveChunk = moveChunkParallel(staticMongod,
-                                          st.s0.host,
-                                          null,
-                                          [chunkWithDoc.min, chunkWithDoc.max],  // bounds
-                                          coll.getFullName(),
-                                          recip.shardName);
-
-    waitForMoveChunkStep(donor, moveChunkStepNames.startedMoveChunk);
-    waitForMigrateStep(recip, migrateStepNames.cloned);
-    proceedToMigrateStep(recip, migrateStepNames.catchup);
-    // recipient has run _recvChunkStart and begun its migration thread;
-    // 'doc' has been cloned and chunkWithDoc is noted as 'pending' on recipient.
-
-    var donorColl = donor.getCollection(ns), recipColl = recip.getCollection(ns);
-
-    assert.eq(1, donorColl.count());
-    assert.eq(1, recipColl.count());
-
-    // cleanupOrphaned should go through two iterations, since the default chunk
-    // setup leaves two unowned ranges on each shard.
-    cleanupOrphaned(donor, ns, 2);
-    cleanupOrphaned(recip, ns, 2);
-    assert.eq(1, donorColl.count());
-    assert.eq(1, recipColl.count());
-
-    // recip has been waiting for donor to call _recvChunkCommit.
-    pauseMoveChunkAtStep(donor, moveChunkStepNames.committed);
-    unpauseMoveChunkAtStep(donor, moveChunkStepNames.startedMoveChunk);
-    proceedToMigrateStep(recip, migrateStepNames.steady);
-    proceedToMigrateStep(recip, migrateStepNames.done);
-
-    cleanupOrphaned(donor, ns, 2);
-    assert.eq(1, donorColl.count());
-    cleanupOrphaned(recip, ns, 2);
-    assert.eq(1, recipColl.count());
-
-    // Let recip side of the migration finish so that the donor proceeds with the commit.
-    unpauseMigrateAtStep(recip, migrateStepNames.done);
-    waitForMoveChunkStep(donor, moveChunkStepNames.committed);
-
-    // Donor is paused after the migration chunk commit, but before it finishes the cleanup that
-    // includes running the range deleter. Thus it technically has orphaned data -- commit is
-    // complete, but moved data is still present. cleanupOrphaned can remove the data the donor
-    // would otherwise clean up itself in its post-move delete phase.
-    cleanupOrphaned(donor, ns, 2);
-    assert.eq(0, donorColl.count());
-
-    // Let migration thread complete.
-    unpauseMoveChunkAtStep(donor, moveChunkStepNames.committed);
-    joinMoveChunk();
-
-    // donor has finished post-move delete, which had nothing to remove with the range deleter
-    // because of the preemptive cleanupOrphaned call.
-    assert.eq(0, donorColl.count());
-    assert.eq(1, recipColl.count());
-    assert.eq(1, coll.count());
-
-    MongoRunner.stopMongod(staticMongod);
-    st.stop();
+//
+// Start a moveChunk in the background from shard 0 to shard 1. Pause it at
+// some points in the donor's and recipient's work flows, and test
+// cleanupOrphaned.
+//
 
+var donor, recip;
+if (chunkWithDoc.shard == st.shard0.shardName) {
+    donor = st.shard0;
+    recip = st.shard1;
+} else {
+    recip = st.shard0;
+    donor = st.shard1;
+}
+
+jsTest.log('setting failpoint startedMoveChunk (donor) and cloned (recipient)');
+pauseMoveChunkAtStep(donor, moveChunkStepNames.startedMoveChunk);
+pauseMigrateAtStep(recip, migrateStepNames.cloned);
+
+var joinMoveChunk = moveChunkParallel(staticMongod,
+                                      st.s0.host,
+                                      null,
+                                      [chunkWithDoc.min, chunkWithDoc.max],  // bounds
+                                      coll.getFullName(),
+                                      recip.shardName);
+
+waitForMoveChunkStep(donor, moveChunkStepNames.startedMoveChunk);
+waitForMigrateStep(recip, migrateStepNames.cloned);
+proceedToMigrateStep(recip, migrateStepNames.catchup);
+// recipient has run _recvChunkStart and begun its migration thread;
+// 'doc' has been cloned and chunkWithDoc is noted as 'pending' on recipient.
+
+var donorColl = donor.getCollection(ns), recipColl = recip.getCollection(ns);
+
+assert.eq(1, donorColl.count());
+assert.eq(1, recipColl.count());
+
+// cleanupOrphaned should go through two iterations, since the default chunk
+// setup leaves two unowned ranges on each shard.
+cleanupOrphaned(donor, ns, 2);
+cleanupOrphaned(recip, ns, 2);
+assert.eq(1, donorColl.count());
+assert.eq(1, recipColl.count());
+
+// recip has been waiting for donor to call _recvChunkCommit.
+pauseMoveChunkAtStep(donor, moveChunkStepNames.committed);
+unpauseMoveChunkAtStep(donor, moveChunkStepNames.startedMoveChunk);
+proceedToMigrateStep(recip, migrateStepNames.steady);
+proceedToMigrateStep(recip, migrateStepNames.done);
+
+cleanupOrphaned(donor, ns, 2);
+assert.eq(1, donorColl.count());
+cleanupOrphaned(recip, ns, 2);
+assert.eq(1, recipColl.count());
+
+// Let recip side of the migration finish so that the donor proceeds with the commit.
+unpauseMigrateAtStep(recip, migrateStepNames.done);
+waitForMoveChunkStep(donor, moveChunkStepNames.committed);
+
+// Donor is paused after the migration chunk commit, but before it finishes the cleanup that
+// includes running the range deleter. Thus it technically has orphaned data -- commit is
+// complete, but moved data is still present. cleanupOrphaned can remove the data the donor
+// would otherwise clean up itself in its post-move delete phase.
+cleanupOrphaned(donor, ns, 2);
+assert.eq(0, donorColl.count());
+
+// Let migration thread complete.
+unpauseMoveChunkAtStep(donor, moveChunkStepNames.committed);
+joinMoveChunk();
+
+// donor has finished post-move delete, which had nothing to remove with the range deleter
+// because of the preemptive cleanupOrphaned call.
+assert.eq(0, donorColl.count());
+assert.eq(1, recipColl.count());
+assert.eq(1, coll.count());
+
+MongoRunner.stopMongod(staticMongod);
+st.stop();
 })();