diff options
120 files changed, 292 insertions, 448 deletions
diff --git a/jstests/core/apply_ops_system_dot_views.js b/jstests/core/apply_ops_system_dot_views.js index 6598a0448a1..8d0e390d078 100644 --- a/jstests/core/apply_ops_system_dot_views.js +++ b/jstests/core/apply_ops_system_dot_views.js @@ -1,12 +1,10 @@ -/* +/** * Tests that applyOps can include operations on the system.views namespace. * @tags: [ - * assumes_superuser_permissions, - * # Views don't support OP_QUERY - * requires_find_command, - * requires_non_retryable_commands, * # applyOps is not supported on mongos * assumes_against_mongod_not_mongos, + * assumes_superuser_permissions, + * requires_non_retryable_commands, * # applyOps uses the oplog that require replication support * requires_replication, * ] diff --git a/jstests/core/command_let_variables.js b/jstests/core/command_let_variables.js index 6a3de698291..8cd1ce83fdc 100644 --- a/jstests/core/command_let_variables.js +++ b/jstests/core/command_let_variables.js @@ -2,8 +2,6 @@ // variables for use in expressions within the command. // @tags: [ // requires_fcv_48, -// # Does not work with legacy shellWriteMode. -// requires_find_command, // ] // (function() { diff --git a/jstests/core/doc_validation_error.js b/jstests/core/doc_validation_error.js index 171dba96f42..846a581cd27 100644 --- a/jstests/core/doc_validation_error.js +++ b/jstests/core/doc_validation_error.js @@ -2,8 +2,6 @@ * Tests document validation errors with sample validators. Note that it uses some JSON Schemas from * schemastore.org. * @tags: [ - * # Does not work with legacy shellWriteMode. - * requires_find_command, * requires_fcv_49, * ] */ diff --git a/jstests/core/explode_for_sort_fetch.js b/jstests/core/explode_for_sort_fetch.js index e968eb9853a..74a929ac60b 100644 --- a/jstests/core/explode_for_sort_fetch.js +++ b/jstests/core/explode_for_sort_fetch.js @@ -1,10 +1,6 @@ /** * Tests explode for sort query planner behavior when the input query plan contains OR > FETCH > * IXSCAN, OR > IXSCAN subtrees or a mix of both. - * @tags: [ - * # Does not work with legacy shellWriteMode. - * requires_find_command, - * ] */ (function() { "use strict"; diff --git a/jstests/core/find_and_modify_hint.js b/jstests/core/find_and_modify_hint.js index 57d0e9eca12..3636c4f0cdc 100644 --- a/jstests/core/find_and_modify_hint.js +++ b/jstests/core/find_and_modify_hint.js @@ -5,7 +5,6 @@ * * @tags: [ * assumes_unsharded_collection, - * requires_find_command, * requires_non_retryable_writes, * ] */ diff --git a/jstests/core/hashed_index_collation.js b/jstests/core/hashed_index_collation.js index f6c8382c3bc..ead8b69bbfc 100644 --- a/jstests/core/hashed_index_collation.js +++ b/jstests/core/hashed_index_collation.js @@ -1,11 +1,8 @@ /** * Tests to verify that hashed indexes obey collation rules. * - * The tags below are necessary because collation requires that we use read/write commands rather - * than legacy operations. * @tags: [ * assumes_unsharded_collection, - * requires_find_command, * ] */ (function() { diff --git a/jstests/core/merge_sort_collation.js b/jstests/core/merge_sort_collation.js index 176d0d842c3..a49dffc765a 100644 --- a/jstests/core/merge_sort_collation.js +++ b/jstests/core/merge_sort_collation.js @@ -4,7 +4,6 @@ * 2) MERGE_SORT stage execution. * @tags: [ * assumes_no_implicit_collection_creation_after_drop, - * requires_find_command, * ] */ (function() { diff --git a/jstests/core/resume_query.js b/jstests/core/resume_query.js index 9b6a9b15794..e4d8f5aa258 100644 --- a/jstests/core/resume_query.js +++ b/jstests/core/resume_query.js @@ -1,11 +1,11 @@ /** * Test that we can use the $_resumeAfter and $_requestResumeToken options to resume a query. * @tags: [ - * assumes_against_mongod_not_mongos, - * requires_find_command, - * requires_persistence, - * multiversion_incompatible, - * requires_getmore] + * assumes_against_mongod_not_mongos, + * multiversion_incompatible, + * requires_getmore, + * requires_persistence, + * ] */ (function() { diff --git a/jstests/core/resume_query_from_non_existent_record.js b/jstests/core/resume_query_from_non_existent_record.js index be47e6dfa56..4ae452762bd 100644 --- a/jstests/core/resume_query_from_non_existent_record.js +++ b/jstests/core/resume_query_from_non_existent_record.js @@ -6,11 +6,10 @@ * same node, since they rely on a record id which is assigned internally by a given node. * * @tags: [ - * assumes_against_mongod_not_mongos, - * requires_find_command, - * requires_non_retryable_writes, - * multiversion_incompatible, - * tenant_migration_incompatible, + * assumes_against_mongod_not_mongos, + * multiversion_incompatible, + * requires_non_retryable_writes, + * tenant_migration_incompatible, * ] */ diff --git a/jstests/core/timeseries/bucket_granularity.js b/jstests/core/timeseries/bucket_granularity.js index a090e7e5684..28156d48c84 100644 --- a/jstests/core/timeseries/bucket_granularity.js +++ b/jstests/core/timeseries/bucket_granularity.js @@ -8,12 +8,11 @@ * # This test depends on certain writes ending up in the same bucket. Stepdowns may result in * # writes splitting between two primaries, and thus different buckets. * does_not_support_stepdowns, - * # Same goes for tenant migrations. - * tenant_migration_incompatible, * does_not_support_transactions, * requires_fcv_49, - * requires_find_command, * requires_timeseries, + * # Same goes for tenant migrations. + * tenant_migration_incompatible, * ] */ diff --git a/jstests/core/timeseries/bucket_timestamp_rounding.js b/jstests/core/timeseries/bucket_timestamp_rounding.js index d3bcf8ef33c..eb331502361 100644 --- a/jstests/core/timeseries/bucket_timestamp_rounding.js +++ b/jstests/core/timeseries/bucket_timestamp_rounding.js @@ -8,12 +8,11 @@ * # This test depends on certain writes ending up in the same bucket. Stepdowns may result in * # writes splitting between two primaries, and thus different buckets. * does_not_support_stepdowns, - * # Same goes for tenant migrations. - * tenant_migration_incompatible, * does_not_support_transactions, * requires_fcv_49, - * requires_find_command, * requires_timeseries, + * # Same goes for tenant migrations. + * tenant_migration_incompatible, * ] */ diff --git a/jstests/core/timeseries/clustered_index_types.js b/jstests/core/timeseries/clustered_index_types.js index c812d0f55ec..7540d7fd14a 100644 --- a/jstests/core/timeseries/clustered_index_types.js +++ b/jstests/core/timeseries/clustered_index_types.js @@ -2,11 +2,10 @@ * Tests inserting various _id values and duplicates on a collection clustered by _id. * * @tags: [ - * assumes_against_mongod_not_mongos, - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * requires_fcv_49, - * requires_find_command, + * assumes_against_mongod_not_mongos, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * requires_fcv_49, * ] */ diff --git a/jstests/core/timeseries/timeseries_bucket_index.js b/jstests/core/timeseries/timeseries_bucket_index.js index 8ac8d28dea2..9a0188ec852 100644 --- a/jstests/core/timeseries/timeseries_bucket_index.js +++ b/jstests/core/timeseries/timeseries_bucket_index.js @@ -2,12 +2,11 @@ * Tests basic index creation and operations on a time-series bucket collection. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_bucket_limit_count.js b/jstests/core/timeseries/timeseries_bucket_limit_count.js index 29df606c72f..dd20aa7a58f 100644 --- a/jstests/core/timeseries/timeseries_bucket_limit_count.js +++ b/jstests/core/timeseries/timeseries_bucket_limit_count.js @@ -1,12 +1,11 @@ /** * Tests maximum number of measurements held in each bucket in a time-series buckets collection. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_bucket_limit_size.js b/jstests/core/timeseries/timeseries_bucket_limit_size.js index 56490596d8b..cb973b81e13 100644 --- a/jstests/core/timeseries/timeseries_bucket_limit_size.js +++ b/jstests/core/timeseries/timeseries_bucket_limit_size.js @@ -1,12 +1,11 @@ /** * Tests maximum size of measurements held in each bucket in a time-series buckets collection. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_bucket_limit_time_range.js b/jstests/core/timeseries/timeseries_bucket_limit_time_range.js index 25b0285f79a..95aa784c861 100644 --- a/jstests/core/timeseries/timeseries_bucket_limit_time_range.js +++ b/jstests/core/timeseries/timeseries_bucket_limit_time_range.js @@ -1,12 +1,11 @@ /** * Tests maximum time-range of measurements held in each bucket in a time-series buckets collection. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_bucket_manual_removal.js b/jstests/core/timeseries/timeseries_bucket_manual_removal.js index c1ebbee8102..a41d87f0b6d 100644 --- a/jstests/core/timeseries/timeseries_bucket_manual_removal.js +++ b/jstests/core/timeseries/timeseries_bucket_manual_removal.js @@ -3,12 +3,11 @@ * collection. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_collation.js b/jstests/core/timeseries/timeseries_collation.js index 011ec27222c..5faa7dd6f23 100644 --- a/jstests/core/timeseries/timeseries_collation.js +++ b/jstests/core/timeseries/timeseries_collation.js @@ -2,12 +2,11 @@ * Tests that time-series collections respect collations for metadata and min/max. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_create_collection.js b/jstests/core/timeseries/timeseries_create_collection.js index 48d0aee4bc7..f5a2cd6891c 100644 --- a/jstests/core/timeseries/timeseries_create_collection.js +++ b/jstests/core/timeseries/timeseries_create_collection.js @@ -4,11 +4,10 @@ * in that case. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_delete.js b/jstests/core/timeseries/timeseries_delete.js index c4cc69b4f06..7c48ddb09e2 100644 --- a/jstests/core/timeseries/timeseries_delete.js +++ b/jstests/core/timeseries/timeseries_delete.js @@ -1,12 +1,11 @@ /** * Tests running the delete command on a time-series collection. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_50, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_50, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_expire.js b/jstests/core/timeseries/timeseries_expire.js index 9a4f20bdf7f..cb9a46585e2 100644 --- a/jstests/core/timeseries/timeseries_expire.js +++ b/jstests/core/timeseries/timeseries_expire.js @@ -2,12 +2,11 @@ * Tests that a time-series collection created with the 'expireAfterSeconds' option will remove * buckets older than 'expireAfterSeconds' based on the bucket creation time. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_id_index.js b/jstests/core/timeseries/timeseries_id_index.js index 596f7ba2570..3ae165e9523 100644 --- a/jstests/core/timeseries/timeseries_id_index.js +++ b/jstests/core/timeseries/timeseries_id_index.js @@ -2,12 +2,11 @@ * Verifies that the _id index cannot be created on a time-series collection. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_id_range.js b/jstests/core/timeseries/timeseries_id_range.js index 9950a81d55d..39d58dc11e4 100644 --- a/jstests/core/timeseries/timeseries_id_range.js +++ b/jstests/core/timeseries/timeseries_id_range.js @@ -3,11 +3,10 @@ * range scan using a combination of minRecord and maxRecord. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_idle_buckets.js b/jstests/core/timeseries/timeseries_idle_buckets.js index b8cfa37a184..9cae73c7576 100644 --- a/jstests/core/timeseries/timeseries_idle_buckets.js +++ b/jstests/core/timeseries/timeseries_idle_buckets.js @@ -2,12 +2,11 @@ * Tests that idle buckets are removed when the bucket catalog's memory threshold is reached. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_index.js b/jstests/core/timeseries/timeseries_index.js index 513595d1115..0fbb392057b 100644 --- a/jstests/core/timeseries/timeseries_index.js +++ b/jstests/core/timeseries/timeseries_index.js @@ -2,12 +2,11 @@ * Tests index creation, index drops, list indexes, hide/unhide index on a time-series collection. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_index_collation.js b/jstests/core/timeseries/timeseries_index_collation.js index 3f66a5a409a..8941c940b4b 100644 --- a/jstests/core/timeseries/timeseries_index_collation.js +++ b/jstests/core/timeseries/timeseries_index_collation.js @@ -2,12 +2,11 @@ * Tests collation with time-series collections. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_index_skipped_record_tracker.js b/jstests/core/timeseries/timeseries_index_skipped_record_tracker.js index 0b66285e334..5631461675b 100644 --- a/jstests/core/timeseries/timeseries_index_skipped_record_tracker.js +++ b/jstests/core/timeseries/timeseries_index_skipped_record_tracker.js @@ -3,12 +3,11 @@ * for time-series collections. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_index_stats.js b/jstests/core/timeseries/timeseries_index_stats.js index 2e24d67aec9..5d5b77f0c5e 100644 --- a/jstests/core/timeseries/timeseries_index_stats.js +++ b/jstests/core/timeseries/timeseries_index_stats.js @@ -2,21 +2,20 @@ * Tests $indexStats on a time-series collection. * * @tags: [ - * # This test attempts to perform write operations and get index usage statistics using the - * # $indexStats stage. The former operation must be routed to the primary in a replica set, - * # whereas the latter may be routed to a secondary. - * assumes_read_preference_unchanged, - * # Cannot implicitly shard accessed collections because of following errmsg: A single - * # update/delete on a sharded collection must contain an exact match on _id or contain the - * # shard key. - * assumes_unsharded_collection, - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, - * requires_non_retryable_writes, + * assumes_no_implicit_collection_creation_after_drop, + * # This test attempts to perform write operations and get index usage statistics using the + * # $indexStats stage. The former operation must be routed to the primary in a replica set, + * # whereas the latter may be routed to a secondary. + * assumes_read_preference_unchanged, + * # Cannot implicitly shard accessed collections because of following errmsg: A single + * # update/delete on a sharded collection must contain an exact match on _id or contain the shard + * # key. + * assumes_unsharded_collection, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, + * requires_non_retryable_writes, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_index_use.js b/jstests/core/timeseries/timeseries_index_use.js index d48a50e68dd..166ed4048fd 100644 --- a/jstests/core/timeseries/timeseries_index_use.js +++ b/jstests/core/timeseries/timeseries_index_use.js @@ -2,12 +2,11 @@ * Tests index usage on meta and time fields for timeseries collections. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_list_collections.js b/jstests/core/timeseries/timeseries_list_collections.js index 9038fb53e05..9d637f8e61a 100644 --- a/jstests/core/timeseries/timeseries_list_collections.js +++ b/jstests/core/timeseries/timeseries_list_collections.js @@ -2,11 +2,10 @@ * Tests the result of running listCollections when there are time-series collections present. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_list_collections_filter_name.js b/jstests/core/timeseries/timeseries_list_collections_filter_name.js index 6f88fe1fe82..ae9a38c9c58 100644 --- a/jstests/core/timeseries/timeseries_list_collections_filter_name.js +++ b/jstests/core/timeseries/timeseries_list_collections_filter_name.js @@ -3,11 +3,10 @@ * name. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_list_collections_invalid_view.js b/jstests/core/timeseries/timeseries_list_collections_invalid_view.js index 0ef1c0874ca..881b9527afa 100644 --- a/jstests/core/timeseries/timeseries_list_collections_invalid_view.js +++ b/jstests/core/timeseries/timeseries_list_collections_invalid_view.js @@ -3,12 +3,11 @@ * invalid view definition. * * @tags: [ - * assumes_against_mongod_not_mongos, - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_against_mongod_not_mongos, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_list_collections_missing_buckets_collection.js b/jstests/core/timeseries/timeseries_list_collections_missing_buckets_collection.js index c0f779425f9..64e25143a7c 100644 --- a/jstests/core/timeseries/timeseries_list_collections_missing_buckets_collection.js +++ b/jstests/core/timeseries/timeseries_list_collections_missing_buckets_collection.js @@ -3,11 +3,10 @@ * backing time-series buckets collection is missing. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_list_collections_missing_view.js b/jstests/core/timeseries/timeseries_list_collections_missing_view.js index 44f74ad31ef..7c3b98a0286 100644 --- a/jstests/core/timeseries/timeseries_list_collections_missing_view.js +++ b/jstests/core/timeseries/timeseries_list_collections_missing_view.js @@ -3,11 +3,10 @@ * time-series view is missing. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_metadata.js b/jstests/core/timeseries/timeseries_metadata.js index 9fe8de0cf0e..c82d2e21688 100644 --- a/jstests/core/timeseries/timeseries_metadata.js +++ b/jstests/core/timeseries/timeseries_metadata.js @@ -2,12 +2,11 @@ * Tests that only measurements with a binary identical meta field are included in the same bucket * in a time-series collection. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_min_max.js b/jstests/core/timeseries/timeseries_min_max.js index 95555304c63..9e42bbd0fbc 100644 --- a/jstests/core/timeseries/timeseries_min_max.js +++ b/jstests/core/timeseries/timeseries_min_max.js @@ -3,12 +3,11 @@ * maximum values inserted into the bucket. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_out_of_order.js b/jstests/core/timeseries/timeseries_out_of_order.js index f0bf52c6221..21a624e9a9b 100644 --- a/jstests/core/timeseries/timeseries_out_of_order.js +++ b/jstests/core/timeseries/timeseries_out_of_order.js @@ -3,12 +3,11 @@ * they are within the time range, regardless of the order in which they are inserted. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_resume_after.js b/jstests/core/timeseries/timeseries_resume_after.js index 3dbff6b2ed0..039a62c379d 100644 --- a/jstests/core/timeseries/timeseries_resume_after.js +++ b/jstests/core/timeseries/timeseries_resume_after.js @@ -3,13 +3,12 @@ * $_resumeAfter. * * @tags: [ - * assumes_against_mongod_not_mongos, - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_against_mongod_not_mongos, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_show_record_id.js b/jstests/core/timeseries/timeseries_show_record_id.js index 4aab2d2901c..4ed664af83d 100644 --- a/jstests/core/timeseries/timeseries_show_record_id.js +++ b/jstests/core/timeseries/timeseries_show_record_id.js @@ -2,12 +2,11 @@ * Verifies that showRecordId() returns the ObjectId type for time-series collections. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_simple.js b/jstests/core/timeseries/timeseries_simple.js index b34bdba23a9..0f56c9fe054 100644 --- a/jstests/core/timeseries/timeseries_simple.js +++ b/jstests/core/timeseries/timeseries_simple.js @@ -2,12 +2,11 @@ * Tests inserting sample data into the time-series buckets collection. * This test is for the simple case of only one measurement per bucket. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_sparse.js b/jstests/core/timeseries/timeseries_sparse.js index 62f7418ea7e..8d14db0cae7 100644 --- a/jstests/core/timeseries/timeseries_sparse.js +++ b/jstests/core/timeseries/timeseries_sparse.js @@ -2,12 +2,11 @@ * Typically, time-series collections use measurements that always contain data for every field. * This test provides coverage for when this is not the case. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/timeseries/timeseries_special_indexes.js b/jstests/core/timeseries/timeseries_special_indexes.js index 74359c0ff8b..6deda20ac5c 100644 --- a/jstests/core/timeseries/timeseries_special_indexes.js +++ b/jstests/core/timeseries/timeseries_special_indexes.js @@ -4,12 +4,11 @@ * Tests index creation, index drops, list indexes, hide/unhide index on a time-series collection. * * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_49, + * requires_getmore, * ] */ diff --git a/jstests/core/timeseries/timeseries_update.js b/jstests/core/timeseries/timeseries_update.js index 2d6df4973d8..0d54891fd12 100644 --- a/jstests/core/timeseries/timeseries_update.js +++ b/jstests/core/timeseries/timeseries_update.js @@ -1,12 +1,11 @@ /** * Tests running the update command on a time-series collection. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * does_not_support_transactions, - * requires_fcv_50, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * does_not_support_transactions, + * requires_fcv_50, + * requires_getmore, * ] */ (function() { diff --git a/jstests/core/txns/timeseries_reads_in_txns.js b/jstests/core/txns/timeseries_reads_in_txns.js index 4520904ffdb..d51b2532325 100644 --- a/jstests/core/txns/timeseries_reads_in_txns.js +++ b/jstests/core/txns/timeseries_reads_in_txns.js @@ -1,10 +1,9 @@ /** * Tests if queries against time-series collections in transactions work as expected. * @tags: [ - * requires_fcv_49, - * requires_find_command, - * assumes_against_mongod_not_mongos, - * uses_transactions, + * assumes_against_mongod_not_mongos, + * requires_fcv_49, + * uses_transactions, * ] */ (function() { diff --git a/jstests/core/update_metrics.js b/jstests/core/update_metrics.js index 42f4d56455d..0af3039822a 100644 --- a/jstests/core/update_metrics.js +++ b/jstests/core/update_metrics.js @@ -3,13 +3,11 @@ * the update command. * * @tags: [ - * requires_fcv_47, - * # The test relies on the precise number of executions of commands. - * requires_non_retryable_writes, - * # The test is designed to work with an unsharded collection. - * assumes_unsharded_collection, - * # The coll.update command does not work with $set operator in compatibility write mode. - * requires_find_command, + * # The test is designed to work with an unsharded collection. + * assumes_unsharded_collection, + * requires_fcv_47, + * # The test relies on the precise number of executions of commands. + * requires_non_retryable_writes, * ] */ (function() { diff --git a/jstests/core/update_pipeline_shell_helpers.js b/jstests/core/update_pipeline_shell_helpers.js index 2af1d48d72b..3c867c8b965 100644 --- a/jstests/core/update_pipeline_shell_helpers.js +++ b/jstests/core/update_pipeline_shell_helpers.js @@ -1,14 +1,10 @@ /** * Tests that each of the update shell helpers correctly validates pipeline-style update operations. * - * This test is tagged as 'requires_find_command' to exclude it from the legacy passthroughs, since - * pipeline syntax cannot be used for OP_UPDATE requests. - * * @tags: [ - * requires_find_command, + * assumes_write_concern_unchanged, * requires_multi_updates, * requires_non_retryable_writes, - * assumes_write_concern_unchanged, * ] */ (function() { diff --git a/jstests/core/update_with_pipeline.js b/jstests/core/update_with_pipeline.js index a574fab69c6..f4df9d6ffbd 100644 --- a/jstests/core/update_with_pipeline.js +++ b/jstests/core/update_with_pipeline.js @@ -1,14 +1,9 @@ /** * Tests execution of pipeline-style update. - * - * 'requires_find_command' needed to prevent this test from running with 'compatibility' write mode - * as pipeline-style update is not supported by OP_UPDATE. - * * @tags: [ - * requires_find_command, + * requires_fcv_50, * requires_multi_updates, * requires_non_retryable_writes, - * requires_fcv_50, * ] */ (function() { diff --git a/jstests/core/verify_update_mods.js b/jstests/core/verify_update_mods.js index 6d3c139a6a5..aa8597136cd 100644 --- a/jstests/core/verify_update_mods.js +++ b/jstests/core/verify_update_mods.js @@ -2,13 +2,11 @@ * Tests update and findAndModify command behavior with update modifiers. * * @tags: [ - * requires_fcv_47, - * # The test is designed to work with an unsharded collection. - * assumes_unsharded_collection, - * # The coll.update command does not work with $set operator in compatibility write mode. - * requires_find_command, - * # Performs modifications that if repeated would fail the test. - * requires_non_retryable_writes, + * # The test is designed to work with an unsharded collection. + * assumes_unsharded_collection, + * requires_fcv_47, + * # Performs modifications that if repeated would fail the test. + * requires_non_retryable_writes, * ] */ (function() { diff --git a/jstests/core/views/dbref_projection.js b/jstests/core/views/dbref_projection.js index b47bcfa8d32..8e41db0d85e 100644 --- a/jstests/core/views/dbref_projection.js +++ b/jstests/core/views/dbref_projection.js @@ -4,7 +4,6 @@ * Legacy find() queries do not support views, so must use the find() command. * @tags: [ * assumes_unsharded_collection, - * requires_find_command, * ] */ (function() { diff --git a/jstests/core/views/views_aggregation.js b/jstests/core/views/views_aggregation.js index d0752b6948a..24cbba8c8e4 100644 --- a/jstests/core/views/views_aggregation.js +++ b/jstests/core/views/views_aggregation.js @@ -5,7 +5,6 @@ * assumes_unsharded_collection, * does_not_support_stepdowns, * does_not_support_transactions, - * requires_find_command, * requires_getmore, * requires_non_retryable_commands, * ] diff --git a/jstests/core/views/views_change.js b/jstests/core/views/views_change.js index d23b7c8805e..ddb9d1feebe 100644 --- a/jstests/core/views/views_change.js +++ b/jstests/core/views/views_change.js @@ -1,9 +1,8 @@ /** * Tests the behavior of views when the backing view or collection is changed. * @tags: [ - * assumes_unsharded_collection, * assumes_superuser_permissions, - * requires_find_command, + * assumes_unsharded_collection, * requires_non_retryable_commands, * ] */ diff --git a/jstests/core/views/views_drop.js b/jstests/core/views/views_drop.js index 5af99dddb55..aacaa01a798 100644 --- a/jstests/core/views/views_drop.js +++ b/jstests/core/views/views_drop.js @@ -2,9 +2,8 @@ * Tests the behavior of views when its backing collection is dropped, as well as the behavior of * system.views when views are dropped. * @tags: [ - * assumes_unsharded_collection, * assumes_superuser_permissions, - * requires_find_command, + * assumes_unsharded_collection, * ] */ (function() { diff --git a/jstests/core/views/views_find.js b/jstests/core/views/views_find.js index a4b763ce7a5..ca2cac23347 100644 --- a/jstests/core/views/views_find.js +++ b/jstests/core/views/views_find.js @@ -3,7 +3,6 @@ * * @tags: [ * assumes_unsharded_collection, - * requires_find_command, * requires_getmore, * ] */ diff --git a/jstests/core/wildcard_index_collation.js b/jstests/core/wildcard_index_collation.js index a33693bb465..a6939bd0898 100644 --- a/jstests/core/wildcard_index_collation.js +++ b/jstests/core/wildcard_index_collation.js @@ -2,12 +2,11 @@ * Test that $** indexes obey collation rules for document values, while the virtual $_path * components stored alongside these values in the index always use simple binary comparison. * - * The tags below are necessary because collation requires that we use read/write commands rather - * than legacy operations. We also require that collections are unsharded, since we perform queries - * which we expect to be covered. + * We require that collections are unsharded, since we perform queries which we expect to be + * covered. + * * @tags: [ * assumes_unsharded_collection, - * requires_find_command, * requires_non_retryable_commands, * requires_non_retryable_writes, * ] diff --git a/jstests/libs/parallelTester.js b/jstests/libs/parallelTester.js index 0ed7c125976..b8fa6a55050 100644 --- a/jstests/libs/parallelTester.js +++ b/jstests/libs/parallelTester.js @@ -116,6 +116,7 @@ if (typeof _threadInject != "undefined") { // and then calls assert.parallelests to run them. ParallelTester = function() { assert.neq(db.getMongo().writeMode(), "legacy", "wrong shell write mode"); + assert.neq(db.getMongo().readMode(), "legacy", "wrong shell read mode"); this.params = new Array(); }; @@ -237,33 +238,6 @@ if (typeof _threadInject != "undefined") { return fileList; }; - // The following tests cannot run when shell readMode is legacy. - if (db.getMongo().readMode() === "legacy") { - var requires_find_command = [ - "apply_ops_system_dot_views.js", - "command_let_variables.js", - "doc_validation_error.js", - "merge_sort_collation.js", - "explode_for_sort_fetch.js", - "update_pipeline_shell_helpers.js", - "update_with_pipeline.js", - "verify_update_mods.js", - "views/dbref_projection.js", - "views/views_aggregation.js", - "views/views_change.js", - "views/views_drop.js", - "views/views_find.js", - "wildcard_index_collation.js" - ]; - Object.assign(skipTests, makeKeys(requires_find_command)); - - // Time-series collections require support for views, so are incompatible with legacy - // readMode. - const timeseriesTestFiles = - getFilesRecursive('jstests/core/timeseries').map(f => ('timeseries/' + f.baseName)); - Object.assign(skipTests, makeKeys(timeseriesTestFiles)); - } - // Transactions are not supported on standalone nodes so we do not run them here. let txnsTestFiles = getFilesRecursive("jstests/core/txns").map(f => ("txns/" + f.baseName)); Object.assign(skipTests, makeKeys(txnsTestFiles)); diff --git a/jstests/noPassthrough/change_streams_oplog_rollover.js b/jstests/noPassthrough/change_streams_oplog_rollover.js index 29bb2a15e42..b684fa6791d 100644 --- a/jstests/noPassthrough/change_streams_oplog_rollover.js +++ b/jstests/noPassthrough/change_streams_oplog_rollover.js @@ -1,6 +1,5 @@ // Tests the behaviour of change streams on an oplog which rolls over. // @tags: [ -// requires_find_command, // requires_journaling, // requires_majority_read_concern, // uses_change_streams, diff --git a/jstests/noPassthrough/change_streams_update_lookup_collation.js b/jstests/noPassthrough/change_streams_update_lookup_collation.js index bb38213093a..dff1cf7c07e 100644 --- a/jstests/noPassthrough/change_streams_update_lookup_collation.js +++ b/jstests/noPassthrough/change_streams_update_lookup_collation.js @@ -1,8 +1,10 @@ // Tests that the update lookup of an unsharded change stream will use the collection-default // collation, regardless of the collation on the change stream. // -// Collation is only supported with the find command, not with op query. -// @tags: [requires_find_command, uses_change_streams, requires_majority_read_concern] +// @tags: [ +// requires_majority_read_concern, +// uses_change_streams, +// ] (function() { "use strict"; diff --git a/jstests/noPassthrough/collmod_ttl.js b/jstests/noPassthrough/collmod_ttl.js index 58b29ce4c35..f68e43b67b5 100644 --- a/jstests/noPassthrough/collmod_ttl.js +++ b/jstests/noPassthrough/collmod_ttl.js @@ -5,7 +5,6 @@ * @tags: [ * assumes_no_implicit_collection_creation_after_drop, * multiversion_incompatible, - * requires_find_command, * requires_ttl_index, * ] */ diff --git a/jstests/noPassthrough/external_sort_find.js b/jstests/noPassthrough/external_sort_find.js index 9e37aee99be..d9e13603290 100644 --- a/jstests/noPassthrough/external_sort_find.js +++ b/jstests/noPassthrough/external_sort_find.js @@ -1,12 +1,6 @@ /** * Test that the find command can spill to disk while executing a blocking sort, if the client * explicitly allows disk usage. - * - * Must be run with read commands enabled, since legacy OP_QUERY reads do not support the - * 'allowDiskUse' parameter. - * @tags: [ - * requires_find_command, - * ] */ (function() { "use strict"; diff --git a/jstests/noPassthrough/non_multikey_ixscan_on_path_with_positional_component.js b/jstests/noPassthrough/non_multikey_ixscan_on_path_with_positional_component.js index 57daeb1dcbf..189808a3161 100644 --- a/jstests/noPassthrough/non_multikey_ixscan_on_path_with_positional_component.js +++ b/jstests/noPassthrough/non_multikey_ixscan_on_path_with_positional_component.js @@ -1,10 +1,6 @@ /** * Tests that we can execute a query which survived a yield using an index scan on a path containing * a positional component. This test was designed to reproduce SERVER-52589. - * - * @tags: [ - * requires_find_command, - * ] */ (function() { "use strict"; diff --git a/jstests/noPassthrough/oplog_rollover_agg.js b/jstests/noPassthrough/oplog_rollover_agg.js index 56a77ffcd6f..447a8b72e1e 100644 --- a/jstests/noPassthrough/oplog_rollover_agg.js +++ b/jstests/noPassthrough/oplog_rollover_agg.js @@ -1,6 +1,5 @@ // Tests the behaviour of an agg with $_requestReshardingResumeToken on an oplog which rolls over. // @tags: [ -// requires_find_command, // requires_journaling, // requires_majority_read_concern, // ] diff --git a/jstests/noPassthrough/resume_query_survives_restart.js b/jstests/noPassthrough/resume_query_survives_restart.js index 69101f10680..e4558dc6337 100644 --- a/jstests/noPassthrough/resume_query_survives_restart.js +++ b/jstests/noPassthrough/resume_query_survives_restart.js @@ -2,7 +2,9 @@ * Test that we can use the $_resumeAfter and $_requestResumeToken options to resume a query * even after the node has been restarted. * - * @tags: [requires_find_command,requires_persistence] + * @tags: [ + * requires_persistence, + * ] */ (function() { diff --git a/jstests/noPassthrough/timeseries_collStats.js b/jstests/noPassthrough/timeseries_collStats.js index 62035e56d20..00d3ea90c71 100644 --- a/jstests/noPassthrough/timeseries_collStats.js +++ b/jstests/noPassthrough/timeseries_collStats.js @@ -3,10 +3,9 @@ * time-series collections. * * @tags: [ - * does_not_support_stepdowns, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * does_not_support_stepdowns, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/noPassthrough/timeseries_downgrade_fcv.js b/jstests/noPassthrough/timeseries_downgrade_fcv.js index 23af01b2ff2..f128320fe1b 100644 --- a/jstests/noPassthrough/timeseries_downgrade_fcv.js +++ b/jstests/noPassthrough/timeseries_downgrade_fcv.js @@ -5,8 +5,7 @@ * TODO (SERVER-56171): Remove this test once 5.0 is last-lts. * * @tags: [ - * requires_fcv_49, - * requires_find_command, + * requires_fcv_49, * ] */ (function() { diff --git a/jstests/noPassthrough/timeseries_latency_stats.js b/jstests/noPassthrough/timeseries_latency_stats.js index 45080d45c7e..23cb8428c11 100644 --- a/jstests/noPassthrough/timeseries_latency_stats.js +++ b/jstests/noPassthrough/timeseries_latency_stats.js @@ -2,11 +2,10 @@ * Tests inserting sample data into the time-series buckets collection. * This test is for the simple case of only one measurement per bucket. * @tags: [ - * assumes_no_implicit_collection_creation_after_drop, - * does_not_support_stepdowns, - * requires_fcv_49, - * requires_find_command, - * requires_getmore, + * assumes_no_implicit_collection_creation_after_drop, + * does_not_support_stepdowns, + * requires_fcv_49, + * requires_getmore, * ] */ (function() { diff --git a/jstests/noPassthrough/timeseries_ttl.js b/jstests/noPassthrough/timeseries_ttl.js index c43b2f2a034..00fdfbe738e 100644 --- a/jstests/noPassthrough/timeseries_ttl.js +++ b/jstests/noPassthrough/timeseries_ttl.js @@ -6,7 +6,6 @@ * assumes_no_implicit_collection_creation_after_drop, * does_not_support_stepdowns, * requires_fcv_49, - * requires_find_command, * requires_getmore, * ] */ diff --git a/jstests/noPassthrough/update_now_clustertime_replset.js b/jstests/noPassthrough/update_now_clustertime_replset.js index fe3db8e4512..ca530b8ecdc 100644 --- a/jstests/noPassthrough/update_now_clustertime_replset.js +++ b/jstests/noPassthrough/update_now_clustertime_replset.js @@ -2,10 +2,11 @@ * Tests that the $$NOW and $$CLUSTER_TIME system variables can be used when performing updates on a * replica set. * - * Tag this test as 'requires_find_command' to prevent it from running in the legacy passthroughs. * The 'requires_replication' tag prevents the test from running on variants with storage options * which cannot support a replica set. - * @tags: [requires_find_command, requires_replication] + * @tags: [ + * requires_replication, + * ] */ (function() { "use strict"; diff --git a/jstests/noPassthrough/update_now_clustertime_sharding.js b/jstests/noPassthrough/update_now_clustertime_sharding.js index 136621e6fa7..526da0df1b2 100644 --- a/jstests/noPassthrough/update_now_clustertime_sharding.js +++ b/jstests/noPassthrough/update_now_clustertime_sharding.js @@ -2,11 +2,9 @@ * Tests that the $$NOW and $$CLUSTER_TIME system variables can be used when performing updates on a * sharded cluster. * - * Tag this test as 'requires_find_command' to prevent it from running in the legacy passthroughs. * The 'requires_sharding' tag prevents the test from running on variants with storage options which * cannot support a sharded cluster. * @tags: [ - * requires_find_command, * requires_sharding, * ] */ diff --git a/jstests/sharding/api_params_nontransaction_sharded.js b/jstests/sharding/api_params_nontransaction_sharded.js index fb8aa0857c2..a4f878322ac 100644 --- a/jstests/sharding/api_params_nontransaction_sharded.js +++ b/jstests/sharding/api_params_nontransaction_sharded.js @@ -3,7 +3,6 @@ * * @tags: [ * multiversion_incompatible, - * requires_find_command, * ] */ diff --git a/jstests/sharding/api_params_nontransaction_unsharded.js b/jstests/sharding/api_params_nontransaction_unsharded.js index 19ad13f34a6..3afe1275d96 100644 --- a/jstests/sharding/api_params_nontransaction_unsharded.js +++ b/jstests/sharding/api_params_nontransaction_unsharded.js @@ -3,7 +3,6 @@ * * @tags: [ * multiversion_incompatible, - * requires_find_command, * ] */ diff --git a/jstests/sharding/api_params_transaction_sharded.js b/jstests/sharding/api_params_transaction_sharded.js index 9bba21c2433..558192f58a7 100644 --- a/jstests/sharding/api_params_transaction_sharded.js +++ b/jstests/sharding/api_params_transaction_sharded.js @@ -3,7 +3,6 @@ * * @tags: [ * multiversion_incompatible, - * requires_find_command, * ] */ diff --git a/jstests/sharding/api_params_transaction_unsharded.js b/jstests/sharding/api_params_transaction_unsharded.js index ae24ab778dc..4a49190a313 100644 --- a/jstests/sharding/api_params_transaction_unsharded.js +++ b/jstests/sharding/api_params_transaction_unsharded.js @@ -3,7 +3,6 @@ * * @tags: [ * multiversion_incompatible, - * requires_find_command, * ] */ diff --git a/jstests/sharding/auth_secondaryok_routing.js b/jstests/sharding/auth_secondaryok_routing.js index 9df5103e824..9d1c010e173 100644 --- a/jstests/sharding/auth_secondaryok_routing.js +++ b/jstests/sharding/auth_secondaryok_routing.js @@ -7,7 +7,9 @@ * engines. When all nodes in a replica set are using an ephemeral storage engine, the set cannot * recover from a full restart. Once restarted, the nodes will have no knowledge of the replica set * config and will be unable to elect a primary. - * @tags: [requires_persistence, requires_find_command] + * @tags: [ + * requires_persistence, + * ] */ (function() { 'use strict'; diff --git a/jstests/sharding/banned_txn_databases_sharded.js b/jstests/sharding/banned_txn_databases_sharded.js index 2058cae0b1b..cf5cea29d83 100644 --- a/jstests/sharding/banned_txn_databases_sharded.js +++ b/jstests/sharding/banned_txn_databases_sharded.js @@ -7,7 +7,6 @@ * database are allowed. * * @tags: [ - * requires_find_command, * uses_transactions, * ] */ diff --git a/jstests/sharding/change_stream_against_shard_mongod.js b/jstests/sharding/change_stream_against_shard_mongod.js index 17067f8c9f7..4aadb68a3ab 100644 --- a/jstests/sharding/change_stream_against_shard_mongod.js +++ b/jstests/sharding/change_stream_against_shard_mongod.js @@ -2,7 +2,6 @@ * Tests that an updateLookup change stream on a sharded collection can be successfully opened * and read from on a shard mongoD. Exercises the fix for SERVER-44977. * @tags: [ - * requires_find_command, * uses_change_streams, * ] */ diff --git a/jstests/sharding/change_stream_error_label.js b/jstests/sharding/change_stream_error_label.js index c62b35743bd..fdfbf784c7b 100644 --- a/jstests/sharding/change_stream_error_label.js +++ b/jstests/sharding/change_stream_error_label.js @@ -2,7 +2,6 @@ * Test that a change stream pipeline which encounters a retryable exception responds to the client * with an error object that includes the "ResumableChangeStreamError" label. * @tags: [ - * requires_find_command, * requires_sharding, * uses_change_streams, * ] diff --git a/jstests/sharding/change_stream_metadata_notifications.js b/jstests/sharding/change_stream_metadata_notifications.js index 2af508b217c..1e3273bfe4a 100644 --- a/jstests/sharding/change_stream_metadata_notifications.js +++ b/jstests/sharding/change_stream_metadata_notifications.js @@ -1,7 +1,5 @@ // Tests metadata notifications of change streams on sharded collections. -// Legacy getMore fails after dropping the database that the original cursor is on. // @tags: [ -// requires_find_command, // requires_majority_read_concern, // ] (function() { diff --git a/jstests/sharding/change_stream_show_migration_events.js b/jstests/sharding/change_stream_show_migration_events.js index 7bb36cf2b3e..17e325c87ef 100644 --- a/jstests/sharding/change_stream_show_migration_events.js +++ b/jstests/sharding/change_stream_show_migration_events.js @@ -1,7 +1,9 @@ // Tests the undocumented 'showMigrationEvents' option for change streams. // -// This test is connecting directly to a shard, and change streams require the getMore command. -// @tags: [requires_find_command, uses_change_streams, requires_majority_read_concern] +// @tags: [ +// requires_majority_read_concern, +// uses_change_streams, +// ] (function() { 'use strict'; diff --git a/jstests/sharding/change_stream_update_lookup_collation.js b/jstests/sharding/change_stream_update_lookup_collation.js index be07efa032b..9666e488ccb 100644 --- a/jstests/sharding/change_stream_update_lookup_collation.js +++ b/jstests/sharding/change_stream_update_lookup_collation.js @@ -1,9 +1,7 @@ // Tests that the post image update lookup will use the simple collation to do shard targeting, but // use the collection's default collation once it gets to the shards. // -// Collation is only supported with the find command, not with op query. // @tags: [ -// requires_find_command, // requires_majority_read_concern, // uses_change_streams, // ] diff --git a/jstests/sharding/change_streams/change_stream_on_system_collection.js b/jstests/sharding/change_streams/change_stream_on_system_collection.js index 713e262f728..7c7cb45d05b 100644 --- a/jstests/sharding/change_streams/change_stream_on_system_collection.js +++ b/jstests/sharding/change_streams/change_stream_on_system_collection.js @@ -4,12 +4,11 @@ * observation of a newly created system.* collection. * * @tags: [ - * assumes_read_preference_unchanged, - * requires_fcv_50, - * uses_change_streams, - * requires_majority_read_concern, - * requires_find_command, - *] + * assumes_read_preference_unchanged, + * requires_fcv_50, + * requires_majority_read_concern, + * uses_change_streams, + * ] */ (function() { "use strict"; diff --git a/jstests/sharding/change_streams/resume_change_stream.js b/jstests/sharding/change_streams/resume_change_stream.js index 441c9e43a83..6c508d58708 100644 --- a/jstests/sharding/change_streams/resume_change_stream.js +++ b/jstests/sharding/change_streams/resume_change_stream.js @@ -1,7 +1,6 @@ // Tests resuming change streams on sharded collections. -// We need to use a readConcern in this test, which requires read commands. +// // @tags: [ -// requires_find_command, // requires_majority_read_concern, // uses_change_streams, // ] diff --git a/jstests/sharding/change_streams_new_shard_new_database.js b/jstests/sharding/change_streams_new_shard_new_database.js index e4debdf534a..f1805e7bb5f 100644 --- a/jstests/sharding/change_streams_new_shard_new_database.js +++ b/jstests/sharding/change_streams_new_shard_new_database.js @@ -2,11 +2,7 @@ * Tests that existing whole-cluster, whole-db and single-collection $changeStreams correctly pick * up events on a newly-added shard when a new unsharded collection is created on it. Exercises the * fix for SERVER-42723. - * Tagging as 'requires_find_command' to ensure that this test is not run in the legacy protocol - * passthroughs. Legacy getMore fails in cases where it is run on a database or collection which - * does not yet exist. * @tags: [ - * requires_find_command, * requires_sharding, * uses_change_streams, * ] diff --git a/jstests/sharding/clear_jumbo.js b/jstests/sharding/clear_jumbo.js index 854481d314e..f6e5830454d 100644 --- a/jstests/sharding/clear_jumbo.js +++ b/jstests/sharding/clear_jumbo.js @@ -1,11 +1,3 @@ -/** - * Use the 'requires_find_command' tag to skip this test in sharding_op_query suite. Otherwise, - * sessionDB.coll.find() will throw "Cannot run a legacy query on a session". - * - * @tags: [ - * requires_find_command, - * ] - */ (function() { "use strict"; diff --git a/jstests/sharding/create_existing_indexes_prepared_transactions.js b/jstests/sharding/create_existing_indexes_prepared_transactions.js index 1dfb09a92aa..b2ea439c5f9 100644 --- a/jstests/sharding/create_existing_indexes_prepared_transactions.js +++ b/jstests/sharding/create_existing_indexes_prepared_transactions.js @@ -3,11 +3,10 @@ // aware of the existing index fails. // // @tags: [ -// requires_find_command, +// live_record_incompatible, // requires_sharding, // uses_multi_shard_transaction, // uses_transactions, -// live_record_incompatible, // ] (function() { "use strict"; diff --git a/jstests/sharding/create_new_collections_prepared_transactions.js b/jstests/sharding/create_new_collections_prepared_transactions.js index 5a10453d5f0..d38d2dbfabd 100644 --- a/jstests/sharding/create_new_collections_prepared_transactions.js +++ b/jstests/sharding/create_new_collections_prepared_transactions.js @@ -2,7 +2,6 @@ // single-shard write transaction. // // @tags: [ -// requires_find_command, // requires_sharding, // uses_multi_shard_transaction, // uses_transactions, diff --git a/jstests/sharding/extract_shard_key_values.js b/jstests/sharding/extract_shard_key_values.js index 7a6413c4804..6969ad2b432 100644 --- a/jstests/sharding/extract_shard_key_values.js +++ b/jstests/sharding/extract_shard_key_values.js @@ -3,7 +3,6 @@ // contain an explicit null value for any missing fields. // // @tags: [ -// requires_find_command, // uses_multi_shard_transactions, // uses_transactions, // ] diff --git a/jstests/sharding/libs/resharding_test_fixture.js b/jstests/sharding/libs/resharding_test_fixture.js index 5bfde1c09b1..352b25e1751 100644 --- a/jstests/sharding/libs/resharding_test_fixture.js +++ b/jstests/sharding/libs/resharding_test_fixture.js @@ -502,9 +502,6 @@ var ReshardingTest = class { // shard would appear as extra documents. const tempColl = this._st.s.getCollection(this._tempNs); const localReadCursor = tempColl.find().sort({_id: 1}); - // tempColl.find().readConcern("available") would be an error when the mongo shell is - // started with --readMode=legacy. We call runCommand() directly to avoid needing to tag - // every test which uses ReshardingTest with "requires_find_command". const availableReadCursor = new DBCommandCursor(tempColl.getDB(), assert.commandWorked(tempColl.runCommand("find", { sort: {_id: 1}, diff --git a/jstests/sharding/migration_waits_for_majority_commit.js b/jstests/sharding/migration_waits_for_majority_commit.js index 68386b8a49b..72ddd53c329 100644 --- a/jstests/sharding/migration_waits_for_majority_commit.js +++ b/jstests/sharding/migration_waits_for_majority_commit.js @@ -1,7 +1,9 @@ /** * This test is meant to test that a migration will correctly wait for the majority commit point * when there are no transfer mod writes (SERVER-42783). - * @tags: [requires_find_command, requires_majority_read_concern] + * @tags: [ + * requires_majority_read_concern, + * ] */ (function() { diff --git a/jstests/sharding/now_variable_replset.js b/jstests/sharding/now_variable_replset.js index 29089ff5e1a..00a7a6d925e 100644 --- a/jstests/sharding/now_variable_replset.js +++ b/jstests/sharding/now_variable_replset.js @@ -1,7 +1,7 @@ /** * Tests for the $$NOW and $$CLUSTER_TIME system variable on a replica set. */ -// @tags: [requires_find_command] + (function() { "use strict"; diff --git a/jstests/sharding/now_variable_sharding.js b/jstests/sharding/now_variable_sharding.js index cc4f8567fa8..13611c0941f 100644 --- a/jstests/sharding/now_variable_sharding.js +++ b/jstests/sharding/now_variable_sharding.js @@ -1,9 +1,7 @@ /** * Tests for the $$NOW and $$CLUSTER_TIME system variable on a sharded cluster. */ -// @tags: [ -// requires_find_command, -// ] + (function() { "use strict"; diff --git a/jstests/sharding/query/cursor_timeout.js b/jstests/sharding/query/cursor_timeout.js index a987d9f0925..affffc76289 100644 --- a/jstests/sharding/query/cursor_timeout.js +++ b/jstests/sharding/query/cursor_timeout.js @@ -14,7 +14,10 @@ // the session cursors #5 and #6 are attached to to simulate that session timing out, and ensures // that cursors #5 and #6 are killed as a result. // -// @tags: [requires_sharding, requires_find_command, requires_fcv_47] +// @tags: [ +// requires_fcv_47, +// requires_sharding, +// ] (function() { 'use strict'; diff --git a/jstests/sharding/query/union_sharded_views.js b/jstests/sharding/query/union_sharded_views.js index cd66172439b..39777b46004 100644 --- a/jstests/sharding/query/union_sharded_views.js +++ b/jstests/sharding/query/union_sharded_views.js @@ -1,8 +1,5 @@ // Tests that $unionWith can successfully read from a view that is backed by a sharded collection. -// @tags: [ -// # Uses $unionWith -// requires_find_command, -// ] + (function() { "use strict"; load("jstests/aggregation/extras/utils.js"); // For 'resultsEq'. diff --git a/jstests/sharding/query/view_on_shard_rewrite.js b/jstests/sharding/query/view_on_shard_rewrite.js index aebb0cda5c1..b197e4040ac 100644 --- a/jstests/sharding/query/view_on_shard_rewrite.js +++ b/jstests/sharding/query/view_on_shard_rewrite.js @@ -12,7 +12,9 @@ * sharded. If not sharded then the primary shard can perform the rewrite locally and execute * without having to round-trip back to mongos. * - * @tags: [requires_find_command, requires_fcv_49] + * @tags: [ + * requires_fcv_49, + * ] */ (function() { "use strict"; diff --git a/jstests/sharding/query/views.js b/jstests/sharding/query/views.js index 48b724a6a99..607efc147c3 100644 --- a/jstests/sharding/query/views.js +++ b/jstests/sharding/query/views.js @@ -1,6 +1,5 @@ /** * Tests for expected behavior when querying a view that is based on a sharded collection. - * @tags: [requires_find_command] */ (function() { "use strict"; diff --git a/jstests/sharding/refine_collection_shard_key_basic.js b/jstests/sharding/refine_collection_shard_key_basic.js index 0a710bba7f2..a751083e47c 100644 --- a/jstests/sharding/refine_collection_shard_key_basic.js +++ b/jstests/sharding/refine_collection_shard_key_basic.js @@ -1,11 +1,6 @@ // // Basic tests for refineCollectionShardKey. // -// Tag this test as 'requires_find_command' to prevent it from running in the legacy passthroughs. -// @tags: [ -// requires_find_command, -// ] -// (function() { 'use strict'; diff --git a/jstests/sharding/refine_collection_shard_key_changelog.js b/jstests/sharding/refine_collection_shard_key_changelog.js index 9d2f3f32195..ae4e50f91d0 100644 --- a/jstests/sharding/refine_collection_shard_key_changelog.js +++ b/jstests/sharding/refine_collection_shard_key_changelog.js @@ -1,11 +1,6 @@ // // Basic tests for refineCollectionShardKey. // -// Tag this test as 'requires_find_command' to prevent it from running in the legacy passthrough. -// @tags: [ -// requires_find_command, -// ] -// (function() { 'use strict'; diff --git a/jstests/sharding/resharding_read_from_secondary.js b/jstests/sharding/resharding_read_from_secondary.js index 1d13f76f483..1d559a8cc65 100644 --- a/jstests/sharding/resharding_read_from_secondary.js +++ b/jstests/sharding/resharding_read_from_secondary.js @@ -4,7 +4,6 @@ * * @tags: [ * requires_fcv_49, - * requires_find_command, * uses_atclustertime, * ] */ diff --git a/jstests/sharding/resume_query_disallowed_on_mongos.js b/jstests/sharding/resume_query_disallowed_on_mongos.js index 84739eb7cfa..46d1d9720fd 100644 --- a/jstests/sharding/resume_query_disallowed_on_mongos.js +++ b/jstests/sharding/resume_query_disallowed_on_mongos.js @@ -1,7 +1,9 @@ /** * Test that trying to use $_resumeAfter and $_requestResumeToken options to resume a query fails * on mongos. - * @tags: [multiversion_incompatible,requires_find_command] + * @tags: [ + * multiversion_incompatible, + * ] */ (function() { diff --git a/jstests/sharding/retryable_write_error_labels.js b/jstests/sharding/retryable_write_error_labels.js index 37bb0dbdf31..b4b5dbdfdc4 100644 --- a/jstests/sharding/retryable_write_error_labels.js +++ b/jstests/sharding/retryable_write_error_labels.js @@ -1,11 +1,7 @@ /** * Test RetryableWriteError label in retryable writes and in transactions. * - * The "requires_find_command" tag excludes this test from the op_query suites, which are - * incompatible with implicit sessions. - * * @tags: [ - * requires_find_command, * uses_transactions, * ] */ diff --git a/jstests/sharding/sharding_non_transaction_snapshot_aggregate.js b/jstests/sharding/sharding_non_transaction_snapshot_aggregate.js index f8f32541047..d7dcc3c585e 100644 --- a/jstests/sharding/sharding_non_transaction_snapshot_aggregate.js +++ b/jstests/sharding/sharding_non_transaction_snapshot_aggregate.js @@ -4,7 +4,6 @@ * * @tags: [ * requires_fcv_47, - * requires_find_command, * requires_majority_read_concern, * requires_persistence, * ] diff --git a/jstests/sharding/sharding_non_transaction_snapshot_read.js b/jstests/sharding/sharding_non_transaction_snapshot_read.js index f68cffc248f..58a9b9e7937 100644 --- a/jstests/sharding/sharding_non_transaction_snapshot_read.js +++ b/jstests/sharding/sharding_non_transaction_snapshot_read.js @@ -3,7 +3,6 @@ * * @tags: [ * requires_fcv_47, - * requires_find_command, * requires_majority_read_concern, * requires_persistence, * ] diff --git a/jstests/sharding/single_shard_find_forwarding.js b/jstests/sharding/single_shard_find_forwarding.js index 4cf60711d45..2957637e54f 100644 --- a/jstests/sharding/single_shard_find_forwarding.js +++ b/jstests/sharding/single_shard_find_forwarding.js @@ -7,9 +7,7 @@ * the primary shard. It then runs a find().skip(n).limit(m) and ensures that the document count * meets expectation. It then runs the same test against a sharded collection with a single shard. */ -// @tags: [ -// requires_find_command, -// ] + load("jstests/libs/profiler.js"); // For profilerHas*OrThrow helper functions. load("jstests/libs/analyze_plan.js"); // For getPlanStages helper function. diff --git a/jstests/sharding/single_shard_transaction_with_arbiter.js b/jstests/sharding/single_shard_transaction_with_arbiter.js index 24c82b78dca..2d1b0266cc0 100644 --- a/jstests/sharding/single_shard_transaction_with_arbiter.js +++ b/jstests/sharding/single_shard_transaction_with_arbiter.js @@ -1,7 +1,9 @@ /** * Tests that single shard transactions succeed against replica sets that contain arbiters. * - * @tags: [uses_transactions, requires_find_command] + * @tags: [ + * uses_transactions, + * ] */ (function() { diff --git a/jstests/sharding/snapshot_reads_target_at_point_in_time.js b/jstests/sharding/snapshot_reads_target_at_point_in_time.js index 2185cb83147..dcecf268027 100644 --- a/jstests/sharding/snapshot_reads_target_at_point_in_time.js +++ b/jstests/sharding/snapshot_reads_target_at_point_in_time.js @@ -2,7 +2,6 @@ // // @tags: [ // requires_fcv_47, -// requires_find_command, // requires_persistence, // requires_sharding, // uses_multi_shard_transaction, diff --git a/jstests/sharding/transactions_causal_consistency.js b/jstests/sharding/transactions_causal_consistency.js index e67fd331bd1..ed9f96117fd 100644 --- a/jstests/sharding/transactions_causal_consistency.js +++ b/jstests/sharding/transactions_causal_consistency.js @@ -1,7 +1,6 @@ // Verifies basic sharded transaction behavior with causal consistency. // // @tags: [ -// requires_find_command, // requires_sharding, // uses_multi_shard_transaction, // uses_transactions, diff --git a/jstests/sharding/transactions_multi_writes.js b/jstests/sharding/transactions_multi_writes.js index d06595c4318..2a5774d388d 100644 --- a/jstests/sharding/transactions_multi_writes.js +++ b/jstests/sharding/transactions_multi_writes.js @@ -2,10 +2,9 @@ * Verifies multi-writes in transactions are sent with shard versions to only the targeted shards. * * @tags: [ - * requires_find_command, - * requires_sharding, - * uses_multi_shard_transaction, - * uses_transactions, + * requires_sharding, + * uses_multi_shard_transaction, + * uses_transactions, * ] */ (function() { diff --git a/jstests/sharding/transactions_read_concerns.js b/jstests/sharding/transactions_read_concerns.js index 0e9f0f907b4..8c59b85c013 100644 --- a/jstests/sharding/transactions_read_concerns.js +++ b/jstests/sharding/transactions_read_concerns.js @@ -1,7 +1,6 @@ // Verifies basic sharded transaction behavior with the supported read concern levels. // // @tags: [ -// requires_find_command, // requires_sharding, // uses_multi_shard_transaction, // uses_transactions, diff --git a/jstests/sharding/transactions_reject_writes_for_moved_chunks.js b/jstests/sharding/transactions_reject_writes_for_moved_chunks.js index 2fcbbec30fa..51971b55cef 100644 --- a/jstests/sharding/transactions_reject_writes_for_moved_chunks.js +++ b/jstests/sharding/transactions_reject_writes_for_moved_chunks.js @@ -2,7 +2,6 @@ // read timestamp. // // @tags: [ -// requires_find_command, // requires_sharding, // uses_multi_shard_transaction, // uses_transactions, diff --git a/jstests/sharding/transactions_view_resolution.js b/jstests/sharding/transactions_view_resolution.js index 41939525a21..498d376f756 100644 --- a/jstests/sharding/transactions_view_resolution.js +++ b/jstests/sharding/transactions_view_resolution.js @@ -2,10 +2,9 @@ * Tests mongos behavior when reading against views in a transaction. * * @tags: [ - * requires_find_command, - * requires_sharding, - * uses_multi_shard_transaction, - * uses_transactions, + * requires_sharding, + * uses_multi_shard_transaction, + * uses_transactions, * ] */ (function() { diff --git a/jstests/sharding/txn_agg.js b/jstests/sharding/txn_agg.js index dea07830dff..3401703f989 100644 --- a/jstests/sharding/txn_agg.js +++ b/jstests/sharding/txn_agg.js @@ -1,4 +1,7 @@ -// @tags: [uses_transactions, requires_find_command, uses_multi_shard_transaction] +// @tags: [ +// uses_multi_shard_transaction, +// uses_transactions, +// ] (function() { "use strict"; diff --git a/jstests/sharding/txn_single_write_shard_failover.js b/jstests/sharding/txn_single_write_shard_failover.js index e2b50a166b6..fd45bcb70f7 100644 --- a/jstests/sharding/txn_single_write_shard_failover.js +++ b/jstests/sharding/txn_single_write_shard_failover.js @@ -10,8 +10,10 @@ * causing the client to retry the whole transaction at a higher transaction number and the * transaction's write to be applied twice. * - * requires_find_command because legacy queries cannot be run in a session. - * @tags: [requires_find_command, uses_transactions, uses_multi_shard_transaction] + * @tags: [ + * uses_multi_shard_transaction, + * uses_transactions, + * ] */ (function() { diff --git a/jstests/sharding/unsharded_lookup_in_txn.js b/jstests/sharding/unsharded_lookup_in_txn.js index ac1bcee7216..f04da181f3c 100644 --- a/jstests/sharding/unsharded_lookup_in_txn.js +++ b/jstests/sharding/unsharded_lookup_in_txn.js @@ -1,7 +1,10 @@ /** * Test that $lookup within a sharded transaction reads from the correct snapshot. - * @tags: [requires_find_command, requires_sharding, uses_multi_shard_transaction, - * uses_transactions] + * @tags: [ + * requires_sharding, + * uses_multi_shard_transaction, + * uses_transactions, + * ] */ (function() { "use strict"; diff --git a/jstests/sharding/update_compound_shard_key.js b/jstests/sharding/update_compound_shard_key.js index 4bfdb4c6cac..e4a9d72d7c9 100644 --- a/jstests/sharding/update_compound_shard_key.js +++ b/jstests/sharding/update_compound_shard_key.js @@ -1,13 +1,9 @@ /** * Tests to validate the functionality of update command in the presence of a compound shard key. * - * Use the 'requires_find_command' tag to skip this test in sharding_op_query suite. Otherwise, - * sessionDB.coll.find() will throw "Cannot run a legacy query on a session". - * * @tags: [ - * requires_find_command, - * uses_multi_shard_transaction, - * uses_transactions, + * uses_multi_shard_transaction, + * uses_transactions, * ] */ (function() { diff --git a/jstests/sharding/update_replace_id.js b/jstests/sharding/update_replace_id.js index 01af4912e03..5c80a54840c 100644 --- a/jstests/sharding/update_replace_id.js +++ b/jstests/sharding/update_replace_id.js @@ -12,7 +12,6 @@ * filter. * * @tags: [ - * requires_find_command, * uses_multi_shard_transactions, * uses_transactions, * ] diff --git a/jstests/sharding/update_shard_key_conflicting_writes.js b/jstests/sharding/update_shard_key_conflicting_writes.js index 2be32f737c6..2a1589dfa48 100644 --- a/jstests/sharding/update_shard_key_conflicting_writes.js +++ b/jstests/sharding/update_shard_key_conflicting_writes.js @@ -2,13 +2,9 @@ * Test the write conflict behavior between updates to a document's shard key and other * updates/deletes. * - * Use the 'requires_find_command' tag to skip this test in sharding_op_query suite. Otherwise, - * sessionDB.coll.find() will throw "Cannot run a legacy query on a session". - * * @tags: [ - * requires_find_command, - * uses_multi_shard_transaction, - * uses_transactions, + * uses_multi_shard_transaction, + * uses_transactions, * ] */ diff --git a/jstests/sharding/update_shard_key_doc_moves_shards.js b/jstests/sharding/update_shard_key_doc_moves_shards.js index ed5c9868b44..6ec4182d8ab 100644 --- a/jstests/sharding/update_shard_key_doc_moves_shards.js +++ b/jstests/sharding/update_shard_key_doc_moves_shards.js @@ -1,7 +1,10 @@ -/* +/** * Tests that changing the shard key value of a document using update and findAndModify works * correctly when the doc will change shards. - * @tags: [requires_find_command, uses_transactions, uses_multi_shard_transaction] + * @tags: [ + * uses_multi_shard_transaction, + * uses_transactions, + * ] */ (function() { diff --git a/jstests/sharding/update_shard_key_doc_on_same_shard.js b/jstests/sharding/update_shard_key_doc_on_same_shard.js index 2fc7a0b2402..925c4d89bb5 100644 --- a/jstests/sharding/update_shard_key_doc_on_same_shard.js +++ b/jstests/sharding/update_shard_key_doc_on_same_shard.js @@ -1,7 +1,10 @@ -/* +/** * Tests that changing the shard key value of a document using update and findAndModify works * correctly when the new shard key value belongs to the same shard. - * @tags: [requires_find_command, uses_transactions, uses_multi_shard_transaction] + * @tags: [ + * uses_multi_shard_transaction, + * uses_transactions, + * ] */ (function() { diff --git a/jstests/sharding/update_shard_key_pipeline_update.js b/jstests/sharding/update_shard_key_pipeline_update.js index f632d058b74..3de7e15a934 100644 --- a/jstests/sharding/update_shard_key_pipeline_update.js +++ b/jstests/sharding/update_shard_key_pipeline_update.js @@ -1,6 +1,9 @@ -/* +/** * Tests that changing the shard key value of a document using pipeline updates. - * @tags: [requires_find_command, uses_transactions, uses_multi_shard_transaction] + * @tags: [ + * uses_multi_shard_transaction, + * uses_transactions, + * ] */ (function() { diff --git a/jstests/sharding/update_sharded.js b/jstests/sharding/update_sharded.js index 48c615c533b..ee9ec595bb6 100644 --- a/jstests/sharding/update_sharded.js +++ b/jstests/sharding/update_sharded.js @@ -2,14 +2,9 @@ * Test simple updates issued through mongos. Updates have different constraints through mongos, * since shard key is immutable. * - * Updating a shard key in a single statement may use a multi shard transaction. Uses the - * 'requires_find_command' tag to skip this test in sharding_op_query suite. Otherwise, - * sessionDb.coll.find() will throw "Cannot run a legacy query on a session". - * * @tags: [ - * requires_find_command, - * uses_multi_shard_transaction, - * uses_transactions, + * uses_multi_shard_transaction, + * uses_transactions, * ] */ (function() { diff --git a/jstests/sharding/verify_sessions_expiration_sharded.js b/jstests/sharding/verify_sessions_expiration_sharded.js index 58d868a0c76..bc3cf254755 100644 --- a/jstests/sharding/verify_sessions_expiration_sharded.js +++ b/jstests/sharding/verify_sessions_expiration_sharded.js @@ -12,8 +12,6 @@ // expiring from the config.system.sessions collection. If the expiration date has been reached // during a currently running operation, the logical session cache should vivify the session and // replace it in the config.system.sessions collection. -// -// @tags: [requires_find_command] (function() { "use strict"; |