Revert "SERVER-35239 AwaitData cursor must handle getMore from client with higher lastKnownCommittedOpTime"

This reverts commit c0c0e651b379b03201e321ae0857beb646721956.

1 files changed, 0 insertions, 109 deletions

diff --git a/jstests/replsets/awaitdata_getmore_new_last_committed_optime.js b/jstests/replsets/awaitdata_getmore_new_last_committed_optime.js
deleted file mode 100644
index c2ab32c68f2..00000000000
--- a/jstests/replsets/awaitdata_getmore_new_last_committed_optime.js
+++ /dev/null
@@ -1,109 +0,0 @@
-// Regression test to ensure that we don't crash during a getMore if the client's
-// lastKnownCommittedOpTime switches from being ahead of the node's lastCommittedOpTime to behind
-// while an awaitData query is running. See SERVER-35239.
-
-(function() {
-    'use strict';
-    load('jstests/replsets/rslib.js');
-    load('jstests/libs/check_log.js');
-
-    const name = 'awaitdata_getmore_new_last_committed_optime';
-    const replSet = new ReplSetTest({name: name, nodes: 5});
-
-    replSet.startSet();
-    replSet.initiate();
-
-    const dbName = 'test';
-    const collName = 'coll';
-
-    const primary = replSet.getPrimary();
-    const secondaries = replSet.getSecondaries();
-    const secondary = secondaries[0];
-
-    const primaryDB = primary.getDB(dbName);
-
-    // Create capped collection on primary and allow it to be committed.
-    assert.commandWorked(primaryDB.createCollection(collName, {capped: true, size: 2048}));
-    replSet.awaitReplication();
-    replSet.awaitLastOpCommitted();
-
-    // Stop data replication on 3 secondaries to prevent writes being committed.
-    jsTestLog('Stopping replication');
-    stopServerReplication(secondaries[1]);
-    stopServerReplication(secondaries[2]);
-    stopServerReplication(secondaries[3]);
-
-    // Write data to primary.
-    for (let i = 0; i < 2; i++) {
-        assert.writeOK(primaryDB[collName].insert({_id: i}, {writeConcern: {w: 2}}));
-    }
-
-    jsTestLog('Secondary has replicated data');
-
-    jsTestLog('Starting parallel shell');
-    // Start a parallel shell because we'll be enabling a failpoint that will make the thread hang.
-    let waitForGetMoreToFinish = startParallelShell(() => {
-        load('jstests/replsets/rslib.js');
-
-        const secondary = db.getMongo();
-        secondary.setSlaveOk();
-
-        const dbName = 'test';
-        const collName = 'coll';
-        const awaitDataDB = db.getSiblingDB('test');
-
-        // Create awaitData cursor and get all data written so that a following getMore will have to
-        // wait for more data.
-        let cmdRes =
-            awaitDataDB.runCommand({find: collName, batchSize: 2, awaitData: true, tailable: true});
-        assert.commandWorked(cmdRes);
-        assert.gt(cmdRes.cursor.id, NumberLong(0));
-        assert.eq(cmdRes.cursor.ns, dbName + "." + collName);
-        assert.eq(cmdRes.cursor.firstBatch.length, 2, tojson(cmdRes));
-
-        // Enable failpoint.
-        assert.commandWorked(db.adminCommand(
-            {configureFailPoint: 'planExecutorHangBeforeShouldWaitForInserts', mode: 'alwaysOn'}));
-
-        // Call getMore on awaitData cursor with lastKnownCommittedOpTime ahead of node. This will
-        // hang until we've disabled the failpoint. maxTimeMS must be set otherwise the default
-        // timeout for waiting for inserts is 1 second.
-        const lastOpTime = getLastOpTime(secondary);
-        cmdRes = awaitDataDB.runCommand({
-            getMore: cmdRes.cursor.id,
-            collection: collName,
-            batchSize: NumberInt(2),
-            maxTimeMS: 10000,
-            lastKnownCommittedOpTime: lastOpTime
-        });
-
-        assert.commandWorked(cmdRes);
-        assert.gt(cmdRes.cursor.id, NumberLong(0));
-        assert.eq(cmdRes.cursor.ns, dbName + "." + collName);
-        assert.eq(cmdRes.cursor.nextBatch.length, 0, tojson(cmdRes));
-    }, secondary.port);
-
-    // Ensure that we've hit the failpoint before moving on.
-    checkLog.contains(
-        secondary, 'PlanExecutor - planExecutorHangBeforeShouldWaitForInserts fail point enabled');
-
-    // Restart replication on the other nodes.
-    jsTestLog('Restarting replication');
-    restartServerReplication(secondaries[1]);
-    restartServerReplication(secondaries[2]);
-    restartServerReplication(secondaries[3]);
-
-    // Wait until all nodes have committed the last op. At this point in executing the getMore,
-    // the node's lastCommittedOpTime should now be ahead of the client's lastKnownCommittedOpTime.
-    replSet.awaitLastOpCommitted();
-    jsTestLog('All nodes caught up');
-
-    // Disable failpoint.
-    assert.commandWorked(secondary.adminCommand(
-        {configureFailPoint: 'planExecutorHangBeforeShouldWaitForInserts', mode: 'off'}));
-
-    waitForGetMoreToFinish();
-    jsTestLog('Parallel shell successfully exited');
-
-    replSet.stopSet();
-})();