SERVER-48312 Remove the 'requires_document_locking' jstest tag

31 files changed, 17 insertions, 62 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 5bc77ff33aa..c48a17be378 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -11859,7 +11859,7 @@ buildvariants:
     # mongodSetParameters.
     test_flags: >-
       --storageEngine=ephemeralForTest
-      --excludeWithAnyTags=requires_persistence,requires_fsync,SERVER-21420,SERVER-21658,requires_journaling,requires_wiredtiger,uses_transactions,requires_document_locking,uses_speculative_majority,requires_snapshot_read,requires_majority_read_concern,uses_change_streams,requires_sharding,incompatible_with_eft
+      --excludeWithAnyTags=requires_persistence,requires_fsync,SERVER-21420,SERVER-21658,requires_journaling,requires_wiredtiger,uses_transactions,uses_speculative_majority,requires_snapshot_read,requires_majority_read_concern,uses_change_streams,requires_sharding,incompatible_with_eft
       --mongodSetParameters="{oplogApplicationEnforcesSteadyStateConstraints: false, enableIndexBuildCommitQuorum: false}"
     compile_flags: -j$(grep -c ^processor /proc/cpuinfo) --dbg=off --opt=on --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
     multiversion_platform: rhel62
diff --git a/jstests/core/txns/commands_banning_txnnumber_outside_transactions.js b/jstests/core/txns/commands_banning_txnnumber_outside_transactions.js
index de3749f14f5..8946fc84392 100644
--- a/jstests/core/txns/commands_banning_txnnumber_outside_transactions.js
+++ b/jstests/core/txns/commands_banning_txnnumber_outside_transactions.js
@@ -1,6 +1,5 @@
 // Test that commands other than retryable writes may not use txnNumber outside transactions.
 // @tags: [
-//   requires_document_locking,
 //   uses_map_reduce_with_temp_collections,
 // ]
 (function() {
diff --git a/jstests/noPassthrough/create_indexes_in_txn_errors_if_already_in_progress.js b/jstests/noPassthrough/create_indexes_in_txn_errors_if_already_in_progress.js
index 3f61700bdd8..ff4f0480d2a 100644
--- a/jstests/noPassthrough/create_indexes_in_txn_errors_if_already_in_progress.js
+++ b/jstests/noPassthrough/create_indexes_in_txn_errors_if_already_in_progress.js
@@ -2,9 +2,6 @@
  * Ensures that a createIndexes command request inside a transaction immediately errors if an
  * existing index build of a duplicate index is already in progress outside of the transaction.
  * @tags: [
- *     # This test depends on two concurrent ops taking
- *     #concurrent collection IX locks.
- *     requires_document_locking,
  *     uses_transactions,
  * ]
  */
diff --git a/jstests/noPassthrough/current_op_reports_validation_io.js b/jstests/noPassthrough/current_op_reports_validation_io.js
index bb0516f0830..3eecda706ee 100644
--- a/jstests/noPassthrough/current_op_reports_validation_io.js
+++ b/jstests/noPassthrough/current_op_reports_validation_io.js
@@ -2,7 +2,10 @@
  * Verifies that the 'dataThroughputLastSecond' and 'dataThroughputAverage' fields appear in the
  * currentOp output while running validation.
  *
- * @tags: [requires_document_locking]
+ * ephemeralForTest does not support background validation, which is needed to report the
+ * 'dataThroughputLastSecond' and 'dataThroughputAverage' fields in currentOp.
+ *
+ * @tags: [incompatible_with_eft]
  */
 (function() {
 const dbName = "test";
diff --git a/jstests/noPassthrough/hybrid_geo_index_remove_invalid_doc.js b/jstests/noPassthrough/hybrid_geo_index_remove_invalid_doc.js
index 9d5abbb5121..71b60d64b52 100644
--- a/jstests/noPassthrough/hybrid_geo_index_remove_invalid_doc.js
+++ b/jstests/noPassthrough/hybrid_geo_index_remove_invalid_doc.js
@@ -2,7 +2,7 @@
  * Tests that building geo indexes using the hybrid method handles the unindexing of invalid
  * geo documents.
  *
- * @tags: [requires_document_locking, requires_replication]
+ * @tags: [requires_replication]
  */
 (function() {
 'use strict';
diff --git a/jstests/noPassthrough/hybrid_geo_index_update_invalid_doc.js b/jstests/noPassthrough/hybrid_geo_index_update_invalid_doc.js
index 4761dfe2601..a951f801197 100644
--- a/jstests/noPassthrough/hybrid_geo_index_update_invalid_doc.js
+++ b/jstests/noPassthrough/hybrid_geo_index_update_invalid_doc.js
@@ -2,7 +2,7 @@
  * Tests that building geo indexes using the hybrid method handles the unindexing of invalid
  * geo documents.
  *
- * @tags: [requires_document_locking, requires_replication]
+ * @tags: [requires_replication]
  */
 (function() {
 'use strict';
diff --git a/jstests/noPassthrough/hybrid_index_with_updates.js b/jstests/noPassthrough/hybrid_index_with_updates.js
index 56439d1e594..bd5874758fa 100644
--- a/jstests/noPassthrough/hybrid_index_with_updates.js
+++ b/jstests/noPassthrough/hybrid_index_with_updates.js
@@ -1,8 +1,6 @@
 /**
  * Tests that write operations are accepted and result in correct indexing behavior for each phase
  * of hybrid index builds.
- *
- * @tags: [requires_document_locking]
  */
 load("jstests/libs/logv2_helpers.js");
 
diff --git a/jstests/noPassthrough/hybrid_partial_geo_index.js b/jstests/noPassthrough/hybrid_partial_geo_index.js
index ebea59da625..668c1654d20 100644
--- a/jstests/noPassthrough/hybrid_partial_geo_index.js
+++ b/jstests/noPassthrough/hybrid_partial_geo_index.js
@@ -1,7 +1,7 @@
 /**
  * Tests that building partial geo indexes using the hybrid method preserves multikey information.
  *
- * @tags: [requires_document_locking, requires_replication]
+ * @tags: [requires_replication]
  */
 (function() {
 'use strict';
diff --git a/jstests/noPassthrough/hybrid_partial_index_update.js b/jstests/noPassthrough/hybrid_partial_index_update.js
index 48244f1880f..746e2ef66be 100644
--- a/jstests/noPassthrough/hybrid_partial_index_update.js
+++ b/jstests/noPassthrough/hybrid_partial_index_update.js
@@ -1,7 +1,7 @@
 /**
  * Tests that building partial indexes using the hybrid method preserves multikey information.
  *
- * @tags: [requires_document_locking, requires_replication]
+ * @tags: [requires_replication]
  */
 (function() {
 'use strict';
diff --git a/jstests/noPassthrough/hybrid_sparse_compound_geo_index.js b/jstests/noPassthrough/hybrid_sparse_compound_geo_index.js
index f5b8f4c7f94..86cabdfcf3f 100644
--- a/jstests/noPassthrough/hybrid_sparse_compound_geo_index.js
+++ b/jstests/noPassthrough/hybrid_sparse_compound_geo_index.js
@@ -2,7 +2,7 @@
  * Tests that building sparse compound geo indexes using the hybrid method preserves multikey
  * information.
  *
- * @tags: [requires_document_locking, requires_replication]
+ * @tags: [requires_replication]
  */
 (function() {
 'use strict';
diff --git a/jstests/noPassthrough/hybrid_unique_index_with_updates.js b/jstests/noPassthrough/hybrid_unique_index_with_updates.js
index 2b119996e52..835a561db24 100644
--- a/jstests/noPassthrough/hybrid_unique_index_with_updates.js
+++ b/jstests/noPassthrough/hybrid_unique_index_with_updates.js
@@ -3,7 +3,7 @@
  * of hybrid unique index builds. This test inserts a duplicate document at different phases of an
  * index build to confirm that the resulting behavior is failure.
  *
- * @tags: [requires_document_locking, requires_replication]
+ * @tags: [requires_replication]
  */
 (function() {
 "use strict";
diff --git a/jstests/noPassthrough/index_abort_before_commit_signal.js b/jstests/noPassthrough/index_abort_before_commit_signal.js
index c0f4574f8fb..61e2a7ee7a0 100644
--- a/jstests/noPassthrough/index_abort_before_commit_signal.js
+++ b/jstests/noPassthrough/index_abort_before_commit_signal.js
@@ -3,7 +3,6 @@
  * is ready to commit by updating the corresponding document in config.system.indexBuilds.
  *
  * @tags: [
- *     requires_document_locking,
  *     requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_builds_ignore_prepare_conflicts.js b/jstests/noPassthrough/index_builds_ignore_prepare_conflicts.js
index 08751e09728..54d005d8b5d 100644
--- a/jstests/noPassthrough/index_builds_ignore_prepare_conflicts.js
+++ b/jstests/noPassthrough/index_builds_ignore_prepare_conflicts.js
@@ -3,7 +3,6 @@
  * state.
  *
  * @tags: [
- *   requires_document_locking,
  *   requires_replication,
  *   uses_prepare_transaction,
  *   uses_transactions,
diff --git a/jstests/noPassthrough/index_failover_resolved_key_errors.js b/jstests/noPassthrough/index_failover_resolved_key_errors.js
index b458ccf4ff4..b590f17b720 100644
--- a/jstests/noPassthrough/index_failover_resolved_key_errors.js
+++ b/jstests/noPassthrough/index_failover_resolved_key_errors.js
@@ -7,7 +7,6 @@
  * build for the entire replica set.
  *
  * @tags: [
- *     requires_document_locking,
  *     requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_failover_resolved_key_errors_after_stepdown.js b/jstests/noPassthrough/index_failover_resolved_key_errors_after_stepdown.js
index eb7e6e3a0f7..a2843034491 100644
--- a/jstests/noPassthrough/index_failover_resolved_key_errors_after_stepdown.js
+++ b/jstests/noPassthrough/index_failover_resolved_key_errors_after_stepdown.js
@@ -7,7 +7,6 @@
  * entire replica set.
  *
  * @tags: [
- *     requires_document_locking,
  *     requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/indexbg2.js b/jstests/noPassthrough/indexbg2.js
index 9410be45915..e4e30f69813 100644
--- a/jstests/noPassthrough/indexbg2.js
+++ b/jstests/noPassthrough/indexbg2.js
@@ -1,5 +1,5 @@
 // Test background index creation w/ constraints
-// @tags: [SERVER-40561, requires_document_locking]
+// @tags: [SERVER-40561]
 
 (function() {
 "use strict";
diff --git a/jstests/noPassthrough/upsert_duplicate_key_retry.js b/jstests/noPassthrough/upsert_duplicate_key_retry.js
index e9f751cd30f..68a4d2c8066 100644
--- a/jstests/noPassthrough/upsert_duplicate_key_retry.js
+++ b/jstests/noPassthrough/upsert_duplicate_key_retry.js
@@ -4,9 +4,7 @@
  * the two failing on the unique index constraint. This test confirms that the failed insert will be
  * retried, resulting in an update.
  *
- * In order for one of the two conflicting upserts to make progress we require a storage engine
- * which supports document level locking.
- *  @tags: [requires_replication, requires_document_locking]
+ * @tags: [requires_replication]
  */
 
 (function() {
diff --git a/jstests/noPassthrough/upsert_duplicate_key_retry_findAndModify.js b/jstests/noPassthrough/upsert_duplicate_key_retry_findAndModify.js
index 02ec54c4de6..02c4c8443a0 100644
--- a/jstests/noPassthrough/upsert_duplicate_key_retry_findAndModify.js
+++ b/jstests/noPassthrough/upsert_duplicate_key_retry_findAndModify.js
@@ -4,9 +4,7 @@
  * the two failing on the unique index constraint. This test confirms that the failed insert will be
  * retried, resulting in an update.
  *
- * In order for one of the two conflicting upserts to make progress we require a storage engine
- * which supports document level locking.
- *  @tags: [requires_replication, requires_document_locking]
+ * @tags: [requires_replication]
  */
 
 (function() {
diff --git a/jstests/noPassthroughWithMongod/create_existing_indexes_no_conflict.js b/jstests/noPassthroughWithMongod/create_existing_indexes_no_conflict.js
index 3305382feca..09a90d2d1a0 100644
--- a/jstests/noPassthroughWithMongod/create_existing_indexes_no_conflict.js
+++ b/jstests/noPassthroughWithMongod/create_existing_indexes_no_conflict.js
@@ -1,9 +1,3 @@
-/*
- * @tags: [
- *     # This test depends on two concurrent ops taking concurrent collection IX locks.
- *     requires_document_locking,
- * ]
- */
 (function() {
 "use strict";
 load("jstests/libs/parallel_shell_helpers.js");
diff --git a/jstests/noPassthroughWithMongod/create_indexes_waits_for_already_in_progress.js b/jstests/noPassthroughWithMongod/create_indexes_waits_for_already_in_progress.js
index 1bd5be0f94f..df9a5a7e166 100644
--- a/jstests/noPassthroughWithMongod/create_indexes_waits_for_already_in_progress.js
+++ b/jstests/noPassthroughWithMongod/create_indexes_waits_for_already_in_progress.js
@@ -13,10 +13,6 @@
  *     assumes_against_mongod_not_mongos,
  *     # Sets a failpoint on one mongod, so switching primaries would break the test.
  *     does_not_support_stepdowns,
- *     # The ephemeralForTest engine has collection level locking, meaning that it upgrades
- *     # collection intent locks to exclusive. This test depends on two concurrent ops taking
- *     # concurrent collection IX locks.
- *     requires_document_locking,
  * ]
  */
 
diff --git a/jstests/noPassthroughWithMongod/create_new_indexes_no_conflicts.js b/jstests/noPassthroughWithMongod/create_new_indexes_no_conflicts.js
index e3e99bdcbdc..8e596b6f640 100644
--- a/jstests/noPassthroughWithMongod/create_new_indexes_no_conflicts.js
+++ b/jstests/noPassthroughWithMongod/create_new_indexes_no_conflicts.js
@@ -1,9 +1,3 @@
-/*
- * @tags: [
- *     # This test depends on two concurrent ops taking concurrent collection IX locks.
- *     requires_document_locking,
- * ]
- */
 (function() {
 "use strict";
 load("jstests/libs/parallel_shell_helpers.js");
diff --git a/jstests/noPassthroughWithMongod/create_new_indexes_with_conflict.js b/jstests/noPassthroughWithMongod/create_new_indexes_with_conflict.js
index fa4fd58414c..0aaf8444747 100644
--- a/jstests/noPassthroughWithMongod/create_new_indexes_with_conflict.js
+++ b/jstests/noPassthroughWithMongod/create_new_indexes_with_conflict.js
@@ -4,8 +4,6 @@
  *     assumes_against_mongod_not_mongos,
  *     # Sets a failpoint on one mongod, so switching primaries would break the test.
  *     does_not_support_stepdowns,
- *     # This test depends on two concurrent ops taking concurrent collection IX locks.
- *     requires_document_locking,
  * ]
  */
 (function() {
diff --git a/jstests/noPassthroughWithMongod/findAndModify_upsert_no_conflicts.js b/jstests/noPassthroughWithMongod/findAndModify_upsert_no_conflicts.js
index 69ab55e9a94..4c9e8370558 100644
--- a/jstests/noPassthroughWithMongod/findAndModify_upsert_no_conflicts.js
+++ b/jstests/noPassthroughWithMongod/findAndModify_upsert_no_conflicts.js
@@ -1,6 +1,5 @@
 /**
  * Tests that findAndModify with upsert=true does not conflict with a collection MODE_IX lock.
- * @tags: [requires_document_locking]
  */
 (function() {
 "use strict";
diff --git a/jstests/replsets/initial_sync_oplog_hole.js b/jstests/replsets/initial_sync_oplog_hole.js
index 148de959e7b..0cc6a1811b4 100644
--- a/jstests/replsets/initial_sync_oplog_hole.js
+++ b/jstests/replsets/initial_sync_oplog_hole.js
@@ -1,7 +1,5 @@
 /**
  * Test that initial sync works without error when the sync source has an oplog hole.
- *
- * @tags: [requires_document_locking]
  */
 (function() {
 "use strict";
diff --git a/jstests/replsets/majority_writes_wait_for_all_durable_timestamp.js b/jstests/replsets/majority_writes_wait_for_all_durable_timestamp.js
index 40d37a62564..99e79ec795e 100644
--- a/jstests/replsets/majority_writes_wait_for_all_durable_timestamp.js
+++ b/jstests/replsets/majority_writes_wait_for_all_durable_timestamp.js
@@ -3,7 +3,7 @@
  * timestamp to reach the timestamp of the write. This guarantees that once a write is majority
  * committed, reading at the all durable timestamp will read that write.
  *
- * @tags: [requires_document_locking]
+ * @tags: [incompatible_with_eft]
  */
 (function() {
 "use strict";
diff --git a/jstests/replsets/oplog_visibility.js b/jstests/replsets/oplog_visibility.js
index 8c0b3d9a728..1ed7301637d 100644
--- a/jstests/replsets/oplog_visibility.js
+++ b/jstests/replsets/oplog_visibility.js
@@ -2,8 +2,6 @@
  * Test oplog visibility enforcement of primaries and secondaries. This test uses a client to read
  * the oplog while there are concurrent writers. The client copies all the timestamps it sees and
  * verifies a later scan over the range returns the same values.
- *
- * @tags: [requires_document_locking]
  */
 (function() {
 "use strict";
diff --git a/jstests/replsets/read_at_cluster_time_outside_transactions.js b/jstests/replsets/read_at_cluster_time_outside_transactions.js
index 4c740ac480f..303b9e30621 100644
--- a/jstests/replsets/read_at_cluster_time_outside_transactions.js
+++ b/jstests/replsets/read_at_cluster_time_outside_transactions.js
@@ -3,7 +3,6 @@
  * $_internalReadAtClusterTime option.
  *
  * @tags: [
- *   requires_document_locking,
  *   requires_fcv_46,
  *   uses_transactions,
  * ]
diff --git a/jstests/replsets/server_status_metrics.js b/jstests/replsets/server_status_metrics.js
index 4f7119b11f1..38d709722ea 100644
--- a/jstests/replsets/server_status_metrics.js
+++ b/jstests/replsets/server_status_metrics.js
@@ -3,11 +3,7 @@
  *
  * The test for metrics.repl.network.oplogGetMoresProcessed requires a storage engine that supports
  * document-level locking because it uses the planExecutorHangBeforeShouldWaitForInserts failpoint
- * to block oplog fetching getMores while trying to do oplog writes. Thus we need a document-level
- * locking storage engine so that oplog writes would not conflict with oplog reads.
- * @tags: [
- *   requires_document_locking,
- * ]
+ * to block oplog fetching getMores while trying to do oplog writes.
  */
 
 (function() {
diff --git a/jstests/replsets/sessions_collection_reaping.js b/jstests/replsets/sessions_collection_reaping.js
index 415bf4a4c82..7061e8c1a50 100644
--- a/jstests/replsets/sessions_collection_reaping.js
+++ b/jstests/replsets/sessions_collection_reaping.js
@@ -1,9 +1,6 @@
 /**
  * Test that only the primary can reap a session and remove the config.transactions doc for the
  * session, and that arbiters never try to a reap session.
- *
- * requires_document_locking because it uses retryable writes
- * @tags: [requires_document_locking]
  */
 
 (function() {
diff --git a/jstests/replsets/unconditional_step_down.js b/jstests/replsets/unconditional_step_down.js
index d15e8ea6230..febe57677ba 100644
--- a/jstests/replsets/unconditional_step_down.js
+++ b/jstests/replsets/unconditional_step_down.js
@@ -1,7 +1,6 @@
 /**
  * Tests that unconditional step down terminates writes, but not reads. And, doesn't disconnect
  * the connections if primary is stepping down to secondary.
- * @tags: [requires_document_locking]
  */
 (function() {
 "use strict";
diff --git a/jstests/sharding/refine_collection_shard_key_basic.js b/jstests/sharding/refine_collection_shard_key_basic.js
index 88f09fb73af..5a0caea6a56 100644
--- a/jstests/sharding/refine_collection_shard_key_basic.js
+++ b/jstests/sharding/refine_collection_shard_key_basic.js
@@ -1,10 +1,8 @@
 //
 // Basic tests for refineCollectionShardKey.
 //
-// Tag this test as 'requires_find_command' to prevent it from running in the legacy passthroughs
-// and as 'requires_document_locking' because it uses retryable writes.
+// Tag this test as 'requires_find_command' to prevent it from running in the legacy passthroughs.
 // @tags: [
-//   requires_document_locking,
 //   requires_find_command,
 // ]
 //