SERVER-67289 Remove feature flag for PM-2218

4 files changed, 9 insertions, 47 deletions

diff --git a/jstests/replsets/dbhash_lock_acquisition.js b/jstests/replsets/dbhash_lock_acquisition.js
index 1e7f3eafe34..0539a99d5ba 100644
--- a/jstests/replsets/dbhash_lock_acquisition.js
+++ b/jstests/replsets/dbhash_lock_acquisition.js
@@ -3,9 +3,6 @@
  * resources when reading a timestamp using the $_internalReadAtClusterTime option.
  *
  * @tags: [
- *   # Incompatible with all feature flags running on last continuous as dbHash runs lock-free in
- *   # v7.0.
- *   requires_fcv_70,
  *   uses_transactions,
  * ]
  */
@@ -22,13 +19,6 @@ rst.initiate();
 const primary = rst.getPrimary();
 const db = primary.getDB("test");
 
-if (FeatureFlagUtil.isEnabled(db, "PointInTimeCatalogLookups")) {
-    jsTestLog("Skipping test as dbHash is run lock-free with " +
-              "the point-in-time catalog lookups feature flag enabled");
-    rst.stopSet();
-    return;
-}
-
 const session = primary.startSession({causalConsistency: false});
 const sessionDB = session.getDatabase(db.getName());
 
diff --git a/jstests/replsets/dbhash_read_at_cluster_time.js b/jstests/replsets/dbhash_read_at_cluster_time.js
index 69635bb4b40..3f2117a28f4 100644
--- a/jstests/replsets/dbhash_read_at_cluster_time.js
+++ b/jstests/replsets/dbhash_read_at_cluster_time.js
@@ -3,9 +3,6 @@
  * read concern are supported by the "dbHash" command.
  *
  * @tags: [
- *   # Incompatible with all feature flags running on last continuous as dbHash can have different
- *   # behaviour in v7.0 when using point-in-time catalog lookups.
- *   requires_fcv_70,
  *   requires_majority_read_concern,
  *   uses_transactions,
  * ]
@@ -177,17 +174,9 @@ assert.eq(atClusterTimeHashBefore,
     const otherDB = otherSession.getDatabase("test");
 
     // We create another collection inside a separate session to modify the collection catalog
-    // at an opTime later than 'clusterTime'. This prevents further usage of the snapshot
-    // associated with 'clusterTime' for snapshot reads if the point-in-time catalog lookups feature
-    // flag is disabled.
+    // at an opTime later than 'clusterTime'.
     assert.commandWorked(otherDB.runCommand({create: "mycoll2"}));
-    if (FeatureFlagUtil.isEnabled(db, "PointInTimeCatalogLookups")) {
-        assert.commandWorked(db.runCommand({dbHash: 1, $_internalReadAtClusterTime: clusterTime}));
-    } else {
-        assert.commandFailedWithCode(
-            db.runCommand({dbHash: 1, $_internalReadAtClusterTime: clusterTime}),
-            ErrorCodes.SnapshotUnavailable);
-    }
+    assert.commandWorked(db.runCommand({dbHash: 1, $_internalReadAtClusterTime: clusterTime}));
 
     otherSession.endSession();
 }
diff --git a/jstests/replsets/read_committed_with_catalog_changes.js b/jstests/replsets/read_committed_with_catalog_changes.js
index 45a9c7b93d1..81cc29bde74 100644
--- a/jstests/replsets/read_committed_with_catalog_changes.js
+++ b/jstests/replsets/read_committed_with_catalog_changes.js
@@ -23,8 +23,6 @@
  *
  * @tags: [
  *   requires_majority_read_concern,
- *   # This test is incompatible with earlier implementations of point-in-time catalog lookups.
- *   requires_fcv_70,
  * ]
  */
 
@@ -208,17 +206,9 @@ const testCases = {
 // Assertion helpers. These must get all state as arguments rather than through closure since
 // they may be passed in to a Thread.
 function assertReadsBlock(db, coll) {
-    var res = coll.runCommand('find', {"readConcern": {"level": "majority"}, "maxTimeMS": 5000});
-
-    // When point-in-time catalog reads are enabled, reads no longer block waiting for the majority
-    // commit point to advance and allow reading earlier than the minimum visible snapshot.
-    if (FeatureFlagUtil.isEnabled(db, "PointInTimeCatalogLookups")) {
-        assert.commandWorked(res);
-    } else {
-        assert.commandFailedWithCode(res,
-                                     ErrorCodes.MaxTimeMSExpired,
-                                     "Expected read of " + coll.getFullName() + " to block");
-    }
+    // With point-in-time catalog lookups, reads no longer block waiting for the majority commit
+    // point to advance.
+    assert.commandWorked(coll.runCommand('find', {"readConcern": {"level": "majority"}}));
 }
 
 function assertReadsSucceed(coll, timeoutMs = 20000) {
diff --git a/jstests/replsets/use_history_after_restart.js b/jstests/replsets/use_history_after_restart.js
index 742d8f7a885..6d02f8db420 100644
--- a/jstests/replsets/use_history_after_restart.js
+++ b/jstests/replsets/use_history_after_restart.js
@@ -1,6 +1,5 @@
 /**
- * Demonstrate that durable history can be used across a restart. Also assert that any
- * collection/index minimum visible timestamps are set to legal values. The rough test outline:
+ * Demonstrate that durable history can be used across a restart. The rough test outline:
  *
  * 1) Create a collection `existsAtOldestTs`. This collection and its `_id` index should be readable
  *    across a restart.
@@ -12,8 +11,6 @@
  * @tags: [
  *   requires_majority_read_concern,
  *   requires_persistence,
- *   # This test is incompatible with earlier implementations of point-in-time catalog lookups.
- *   requires_fcv_70,
  * ]
  */
 
@@ -125,13 +122,9 @@ result = primary.getDB("test").runCommand(
     {find: "dneAtOldestTs", readConcern: {level: "snapshot", atClusterTime: oldestTimestamp}});
 jsTestLog({"SnapshotUnavailable on dneAtOldestTs": result});
 
-if (FeatureFlagUtil.isEnabled(primary.getDB("test"), "PointInTimeCatalogLookups")) {
-    // The collection does not exist at this time so find will return an empty result set.
-    assert.commandWorked(result);
-    assert.eq(0, result["cursor"]["firstBatch"].length);
-} else {
-    assert.commandFailedWithCode(result, ErrorCodes.SnapshotUnavailable);
-}
+// The collection does not exist at this time so find will return an empty result set.
+assert.commandWorked(result);
+assert.eq(0, result["cursor"]["firstBatch"].length);
 
 // Querying `dneAtOldestTs` at the stable timestamp should succeed with a correct result.
 result = primary.getDB("test").runCommand(