1 files changed, 159 insertions, 163 deletions
diff --git a/jstests/sharding/change_stream_chunk_migration.js b/jstests/sharding/change_stream_chunk_migration.js
index 64f7d860c2a..a4e74ed3efd 100644
--- a/jstests/sharding/change_stream_chunk_migration.js
+++ b/jstests/sharding/change_stream_chunk_migration.js
@@ -2,167 +2,163 @@
 // it's migrating a chunk to a new shard.
 // @tags: [uses_change_streams]
 (function() {
-    'use strict';
-
-    // For supportsMajorityReadConcern().
-    load("jstests/multiVersion/libs/causal_consistency_helpers.js");
-
-    if (!supportsMajorityReadConcern()) {
-        jsTestLog("Skipping test since storage engine doesn't support majority read concern.");
-        return;
-    }
-
-    // TODO WT-3864: Re-enable test for LSM once transaction visibility bug in LSM is resolved.
-    if (jsTest.options().wiredTigerCollectionConfigString === "type=lsm") {
-        jsTestLog("Skipping test because we're running with WiredTiger's LSM tree.");
-        return;
-    }
-
-    const rsNodeOptions = {
-        // Use a higher frequency for periodic noops to speed up the test.
-        setParameter: {periodicNoopIntervalSecs: 1, writePeriodicNoops: true}
-    };
-    const st =
-        new ShardingTest({shards: 2, mongos: 1, rs: {nodes: 1}, other: {rsOptions: rsNodeOptions}});
-
-    const mongos = st.s;
-    const mongosColl = mongos.getCollection('test.foo');
-    const mongosDB = mongos.getDB("test");
-
-    // Enable sharding to inform mongos of the database, allowing us to open a cursor.
-    assert.commandWorked(mongos.adminCommand({enableSharding: mongosDB.getName()}));
-
-    // Make sure all chunks start on shard 0.
-    st.ensurePrimaryShard(mongosDB.getName(), st.shard0.shardName);
-
-    // Open a change stream cursor before the collection is sharded.
-    const changeStream = mongosColl.aggregate([{$changeStream: {}}]);
-    assert(!changeStream.hasNext(), "Do not expect any results yet");
-
-    jsTestLog("Sharding collection");
-    // Once we have a cursor, actually shard the collection.
-    assert.commandWorked(
-        mongos.adminCommand({shardCollection: mongosColl.getFullName(), key: {_id: 1}}));
-
-    // Insert two documents.
-    assert.writeOK(mongosColl.insert({_id: 0}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 20}, {writeConcern: {w: "majority"}}));
-
-    // Split the collection into two chunks: [MinKey, 10) and [10, MaxKey].
-    assert.commandWorked(mongos.adminCommand({split: mongosColl.getFullName(), middle: {_id: 10}}));
-
-    jsTestLog("Migrating [10, MaxKey] chunk to shard1.");
-    assert.commandWorked(mongos.adminCommand({
-        moveChunk: mongosColl.getFullName(),
-        find: {_id: 20},
-        to: st.shard1.shardName,
-        _waitForDelete: true
-    }));
-
-    for (let id of[0, 20]) {
-        assert.soon(() => changeStream.hasNext());
-        let next = changeStream.next();
-        assert.eq(next.operationType, "insert");
-        assert.eq(next.documentKey, {_id: id});
-    }
-
-    // Insert into both the chunks.
-    assert.writeOK(mongosColl.insert({_id: 1}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 21}, {writeConcern: {w: "majority"}}));
-
-    // Split again, and move a second chunk to the first shard. The new chunks are:
-    // [MinKey, 0), [0, 10), and [10, MaxKey].
-    jsTestLog("Moving [MinKey, 0] to shard 1");
-    assert.commandWorked(mongos.adminCommand({split: mongosColl.getFullName(), middle: {_id: 0}}));
-    assert.commandWorked(mongos.adminCommand({
-        moveChunk: mongosColl.getFullName(),
-        find: {_id: 5},
-        to: st.shard1.shardName,
-        _waitForDelete: true
-    }));
-
-    // Insert again, into all three chunks.
-    assert.writeOK(mongosColl.insert({_id: -2}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 2}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 22}, {writeConcern: {w: "majority"}}));
-
-    // Make sure we can see all the inserts, without any 'retryNeeded' entries.
-    for (let nextExpectedId of[1, 21, -2, 2, 22]) {
-        assert.soon(() => changeStream.hasNext());
-        let item = changeStream.next();
-        assert.eq(item.documentKey, {_id: nextExpectedId});
-    }
-
-    // Make sure we're at the end of the stream.
-    assert(!changeStream.hasNext());
-
-    // Test that migrating the last chunk to shard 1 (meaning all chunks are now on the same shard)
-    // will not invalidate the change stream.
-
-    // Insert into all three chunks.
-    jsTestLog("Insert into all three chunks");
-    assert.writeOK(mongosColl.insert({_id: -3}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 3}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 23}, {writeConcern: {w: "majority"}}));
-
-    jsTestLog("Move the [Minkey, 0) chunk to shard 1.");
-    assert.commandWorked(mongos.adminCommand({
-        moveChunk: mongosColl.getFullName(),
-        find: {_id: -5},
-        to: st.shard1.shardName,
-        _waitForDelete: true
-    }));
-
-    // Insert again, into all three chunks.
-    assert.writeOK(mongosColl.insert({_id: -4}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 4}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 24}, {writeConcern: {w: "majority"}}));
-
-    // Make sure we can see all the inserts, without any 'retryNeeded' entries.
-    for (let nextExpectedId of[-3, 3, 23, -4, 4, 24]) {
-        assert.soon(() => changeStream.hasNext());
-        assert.eq(changeStream.next().documentKey, {_id: nextExpectedId});
-    }
-
-    // Now test that adding a new shard and migrating a chunk to it will continue to
-    // return the correct results.
-    const newShard = new ReplSetTest({name: "newShard", nodes: 1, nodeOptions: rsNodeOptions});
-    newShard.startSet({shardsvr: ''});
-    newShard.initiate();
-    assert.commandWorked(mongos.adminCommand({addShard: newShard.getURL(), name: "newShard"}));
-
-    // At this point, there haven't been any migrations to that shard; check that the changeStream
-    // works normally.
-    assert.writeOK(mongosColl.insert({_id: -5}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 5}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 25}, {writeConcern: {w: "majority"}}));
-
-    for (let nextExpectedId of[-5, 5, 25]) {
-        assert.soon(() => changeStream.hasNext());
-        assert.eq(changeStream.next().documentKey, {_id: nextExpectedId});
-    }
-
-    assert.writeOK(mongosColl.insert({_id: 16}, {writeConcern: {w: "majority"}}));
-
-    // Now migrate a chunk to the new shard and verify the stream continues to return results
-    // from both before and after the migration.
-    jsTestLog("Migrating [10, MaxKey] chunk to new shard.");
-    assert.commandWorked(mongos.adminCommand({
-        moveChunk: mongosColl.getFullName(),
-        find: {_id: 20},
-        to: "newShard",
-        _waitForDelete: true
-    }));
-    assert.writeOK(mongosColl.insert({_id: -6}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 6}, {writeConcern: {w: "majority"}}));
-    assert.writeOK(mongosColl.insert({_id: 26}, {writeConcern: {w: "majority"}}));
-
-    for (let nextExpectedId of[16, -6, 6, 26]) {
-        assert.soon(() => changeStream.hasNext());
-        assert.eq(changeStream.next().documentKey, {_id: nextExpectedId});
-    }
-    assert(!changeStream.hasNext());
-
-    st.stop();
-    newShard.stopSet();
+'use strict';
+
+// For supportsMajorityReadConcern().
+load("jstests/multiVersion/libs/causal_consistency_helpers.js");
+
+if (!supportsMajorityReadConcern()) {
+    jsTestLog("Skipping test since storage engine doesn't support majority read concern.");
+    return;
+}
+
+// TODO WT-3864: Re-enable test for LSM once transaction visibility bug in LSM is resolved.
+if (jsTest.options().wiredTigerCollectionConfigString === "type=lsm") {
+    jsTestLog("Skipping test because we're running with WiredTiger's LSM tree.");
+    return;
+}
+
+const rsNodeOptions = {
+    // Use a higher frequency for periodic noops to speed up the test.
+    setParameter: {periodicNoopIntervalSecs: 1, writePeriodicNoops: true}
+};
+const st =
+    new ShardingTest({shards: 2, mongos: 1, rs: {nodes: 1}, other: {rsOptions: rsNodeOptions}});
+
+const mongos = st.s;
+const mongosColl = mongos.getCollection('test.foo');
+const mongosDB = mongos.getDB("test");
+
+// Enable sharding to inform mongos of the database, allowing us to open a cursor.
+assert.commandWorked(mongos.adminCommand({enableSharding: mongosDB.getName()}));
+
+// Make sure all chunks start on shard 0.
+st.ensurePrimaryShard(mongosDB.getName(), st.shard0.shardName);
+
+// Open a change stream cursor before the collection is sharded.
+const changeStream = mongosColl.aggregate([{$changeStream: {}}]);
+assert(!changeStream.hasNext(), "Do not expect any results yet");
+
+jsTestLog("Sharding collection");
+// Once we have a cursor, actually shard the collection.
+assert.commandWorked(
+    mongos.adminCommand({shardCollection: mongosColl.getFullName(), key: {_id: 1}}));
+
+// Insert two documents.
+assert.writeOK(mongosColl.insert({_id: 0}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 20}, {writeConcern: {w: "majority"}}));
+
+// Split the collection into two chunks: [MinKey, 10) and [10, MaxKey].
+assert.commandWorked(mongos.adminCommand({split: mongosColl.getFullName(), middle: {_id: 10}}));
+
+jsTestLog("Migrating [10, MaxKey] chunk to shard1.");
+assert.commandWorked(mongos.adminCommand({
+    moveChunk: mongosColl.getFullName(),
+    find: {_id: 20},
+    to: st.shard1.shardName,
+    _waitForDelete: true
+}));
+
+for (let id of [0, 20]) {
+    assert.soon(() => changeStream.hasNext());
+    let next = changeStream.next();
+    assert.eq(next.operationType, "insert");
+    assert.eq(next.documentKey, {_id: id});
+}
+
+// Insert into both the chunks.
+assert.writeOK(mongosColl.insert({_id: 1}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 21}, {writeConcern: {w: "majority"}}));
+
+// Split again, and move a second chunk to the first shard. The new chunks are:
+// [MinKey, 0), [0, 10), and [10, MaxKey].
+jsTestLog("Moving [MinKey, 0] to shard 1");
+assert.commandWorked(mongos.adminCommand({split: mongosColl.getFullName(), middle: {_id: 0}}));
+assert.commandWorked(mongos.adminCommand({
+    moveChunk: mongosColl.getFullName(),
+    find: {_id: 5},
+    to: st.shard1.shardName,
+    _waitForDelete: true
+}));
+
+// Insert again, into all three chunks.
+assert.writeOK(mongosColl.insert({_id: -2}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 2}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 22}, {writeConcern: {w: "majority"}}));
+
+// Make sure we can see all the inserts, without any 'retryNeeded' entries.
+for (let nextExpectedId of [1, 21, -2, 2, 22]) {
+    assert.soon(() => changeStream.hasNext());
+    let item = changeStream.next();
+    assert.eq(item.documentKey, {_id: nextExpectedId});
+}
+
+// Make sure we're at the end of the stream.
+assert(!changeStream.hasNext());
+
+// Test that migrating the last chunk to shard 1 (meaning all chunks are now on the same shard)
+// will not invalidate the change stream.
+
+// Insert into all three chunks.
+jsTestLog("Insert into all three chunks");
+assert.writeOK(mongosColl.insert({_id: -3}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 3}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 23}, {writeConcern: {w: "majority"}}));
+
+jsTestLog("Move the [Minkey, 0) chunk to shard 1.");
+assert.commandWorked(mongos.adminCommand({
+    moveChunk: mongosColl.getFullName(),
+    find: {_id: -5},
+    to: st.shard1.shardName,
+    _waitForDelete: true
+}));
+
+// Insert again, into all three chunks.
+assert.writeOK(mongosColl.insert({_id: -4}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 4}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 24}, {writeConcern: {w: "majority"}}));
+
+// Make sure we can see all the inserts, without any 'retryNeeded' entries.
+for (let nextExpectedId of [-3, 3, 23, -4, 4, 24]) {
+    assert.soon(() => changeStream.hasNext());
+    assert.eq(changeStream.next().documentKey, {_id: nextExpectedId});
+}
+
+// Now test that adding a new shard and migrating a chunk to it will continue to
+// return the correct results.
+const newShard = new ReplSetTest({name: "newShard", nodes: 1, nodeOptions: rsNodeOptions});
+newShard.startSet({shardsvr: ''});
+newShard.initiate();
+assert.commandWorked(mongos.adminCommand({addShard: newShard.getURL(), name: "newShard"}));
+
+// At this point, there haven't been any migrations to that shard; check that the changeStream
+// works normally.
+assert.writeOK(mongosColl.insert({_id: -5}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 5}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 25}, {writeConcern: {w: "majority"}}));
+
+for (let nextExpectedId of [-5, 5, 25]) {
+    assert.soon(() => changeStream.hasNext());
+    assert.eq(changeStream.next().documentKey, {_id: nextExpectedId});
+}
+
+assert.writeOK(mongosColl.insert({_id: 16}, {writeConcern: {w: "majority"}}));
+
+// Now migrate a chunk to the new shard and verify the stream continues to return results
+// from both before and after the migration.
+jsTestLog("Migrating [10, MaxKey] chunk to new shard.");
+assert.commandWorked(mongos.adminCommand(
+    {moveChunk: mongosColl.getFullName(), find: {_id: 20}, to: "newShard", _waitForDelete: true}));
+assert.writeOK(mongosColl.insert({_id: -6}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 6}, {writeConcern: {w: "majority"}}));
+assert.writeOK(mongosColl.insert({_id: 26}, {writeConcern: {w: "majority"}}));
+
+for (let nextExpectedId of [16, -6, 6, 26]) {
+    assert.soon(() => changeStream.hasNext());
+    assert.eq(changeStream.next().documentKey, {_id: nextExpectedId});
+}
+assert(!changeStream.hasNext());
+
+st.stop();
+newShard.stopSet();
 })();