diff options
18 files changed, 69 insertions, 14 deletions
diff --git a/jstests/core/txns/no_snapshot_writes_outside_txn.js b/jstests/core/txns/no_snapshot_writes_outside_txn.js index 1694719e04b..bf2162c5265 100644 --- a/jstests/core/txns/no_snapshot_writes_outside_txn.js +++ b/jstests/core/txns/no_snapshot_writes_outside_txn.js @@ -2,7 +2,11 @@ * Verify that readConcern: snapshot is not permitted for writes outside transactions. * * // TODO(SERVER-47915): remove assumes_against_mongod_not_mongos - * @tags: [uses_transactions, assumes_against_mongod_not_mongos] + * @tags: [ + * assumes_against_mongod_not_mongos, + * requires_persistence, + * uses_transactions, + * ] */ (function() { diff --git a/jstests/noPassthrough/non_transaction_snapshot_reads_without_majority_reads.js b/jstests/noPassthrough/non_transaction_snapshot_reads_without_majority_reads.js index 5b949cdb220..7e2314b673d 100644 --- a/jstests/noPassthrough/non_transaction_snapshot_reads_without_majority_reads.js +++ b/jstests/noPassthrough/non_transaction_snapshot_reads_without_majority_reads.js @@ -1,7 +1,11 @@ /* Tests readConcern level snapshot outside of transactions is not supported when * enableMajorityReadConcern is false. * - * @tags: [requires_replication, requires_fcv_46] + * @tags: [ + * requires_fcv_46, + * requires_persistence, + * requires_replication, + * ] */ (function() { "use strict"; diff --git a/jstests/noPassthrough/readConcern_atClusterTime.js b/jstests/noPassthrough/readConcern_atClusterTime.js index 2a666955dc1..b9a772a1162 100644 --- a/jstests/noPassthrough/readConcern_atClusterTime.js +++ b/jstests/noPassthrough/readConcern_atClusterTime.js @@ -2,7 +2,12 @@ // // Only run this test with the WiredTiger storage engine, since we expect other storage engines to // return early because they do not support snapshot read concern. -// @tags: [requires_wiredtiger, uses_transactions, uses_atclustertime] +// @tags: [ +// requires_persistence, +// requires_wiredtiger, +// uses_atclustertime, +// uses_transactions, +// ] function _getClusterTime(rst) { const pingRes = assert.commandWorked(rst.getPrimary().adminCommand({ping: 1})); diff --git a/jstests/noPassthrough/readConcern_snapshot.js b/jstests/noPassthrough/readConcern_snapshot.js index a4d335af6b4..e151fdb4f1f 100644 --- a/jstests/noPassthrough/readConcern_snapshot.js +++ b/jstests/noPassthrough/readConcern_snapshot.js @@ -1,6 +1,11 @@ // Test parsing of readConcern level 'snapshot' and the presence of the 'atClusterTime' field in // snapshot cursor responses. -// @tags: [requires_majority_read_concern, requires_replication, uses_transactions] +// @tags: [ +// requires_majority_read_concern, +// requires_persistence, +// requires_replication, +// uses_transactions, +// ] (function() { "use strict"; diff --git a/jstests/noPassthrough/readConcern_snapshot_mongos.js b/jstests/noPassthrough/readConcern_snapshot_mongos.js index ee61cb86e8d..c88f34844db 100644 --- a/jstests/noPassthrough/readConcern_snapshot_mongos.js +++ b/jstests/noPassthrough/readConcern_snapshot_mongos.js @@ -1,6 +1,12 @@ // Test parsing of readConcern level 'snapshot' and the presence of the 'atClusterTime' field in // snapshot cursor responses on mongos. -// @tags: [requires_replication,requires_sharding, uses_transactions, uses_atclustertime] +// @tags: [ +// requires_persistence, +// requires_replication, +// requires_sharding, +// uses_atclustertime, +// uses_transactions, +// ] (function() { "use strict"; diff --git a/jstests/noPassthrough/server_read_concern_metrics.js b/jstests/noPassthrough/server_read_concern_metrics.js index 350b6e7faa9..f9fdb3a2a9f 100644 --- a/jstests/noPassthrough/server_read_concern_metrics.js +++ b/jstests/noPassthrough/server_read_concern_metrics.js @@ -1,5 +1,9 @@ // Tests readConcern level metrics in the serverStatus output. -// @tags: [uses_transactions, requires_majority_read_concern] +// @tags: [ +// requires_majority_read_concern, +// requires_persistence, +// uses_transactions, +// ] (function() { "use strict"; diff --git a/jstests/noPassthrough/shell_cursor_read_timestamp.js b/jstests/noPassthrough/shell_cursor_read_timestamp.js index a954017804b..7bc6c79fd29 100644 --- a/jstests/noPassthrough/shell_cursor_read_timestamp.js +++ b/jstests/noPassthrough/shell_cursor_read_timestamp.js @@ -1,7 +1,11 @@ /** * Tests readConcern level snapshot outside of transactions. * - * @tags: [requires_majority_read_concern, requires_replication] + * @tags: [ + * requires_majority_read_concern, + * requires_persistence, + * requires_replication, + * ] */ (function() { "use strict"; diff --git a/jstests/noPassthrough/snapshot_history_window.js b/jstests/noPassthrough/snapshot_history_window.js index 8ca2545dece..2b089565369 100644 --- a/jstests/noPassthrough/snapshot_history_window.js +++ b/jstests/noPassthrough/snapshot_history_window.js @@ -2,7 +2,11 @@ * Test setting minSnapshotHistoryWindowInSeconds at runtime and that server keeps history for up to * minSnapshotHistoryWindowInSeconds. * - * @tags: [requires_majority_read_concern, requires_replication] + * @tags: [ + * requires_majority_read_concern, + * requires_persistence, + * requires_replication + * ] */ (function() { "use strict"; diff --git a/jstests/noPassthrough/snapshot_reads_capped_collection.js b/jstests/noPassthrough/snapshot_reads_capped_collection.js index 540159a99f3..a3abe128301 100644 --- a/jstests/noPassthrough/snapshot_reads_capped_collection.js +++ b/jstests/noPassthrough/snapshot_reads_capped_collection.js @@ -1,6 +1,10 @@ /* Test that snapshot reads on capped collections are not allowed. * - * @tags: [requires_majority_read_concern, requires_replication] + * @tags: [ + * requires_majority_read_concern, + * requires_persistence, + * requires_replication, + * ] */ (function() { "use strict"; diff --git a/jstests/replsets/non_transaction_snapshot_reads.js b/jstests/replsets/non_transaction_snapshot_reads.js index ce561d3daec..402b34601b5 100644 --- a/jstests/replsets/non_transaction_snapshot_reads.js +++ b/jstests/replsets/non_transaction_snapshot_reads.js @@ -4,6 +4,7 @@ * @tags: [ * requires_fcv_46, * requires_majority_read_concern, + * requires_persistence, * ] */ (function() { diff --git a/jstests/replsets/read_concern_snapshot_uses_committed.js b/jstests/replsets/read_concern_snapshot_uses_committed.js index 928ef1bbf40..47590c497f7 100644 --- a/jstests/replsets/read_concern_snapshot_uses_committed.js +++ b/jstests/replsets/read_concern_snapshot_uses_committed.js @@ -5,7 +5,11 @@ * the majority commit point to move past the atClusterTime (or afterClusterTime) before they can * read. * - * @tags: [requires_majority_read_concern, requires_fcv_46] + * @tags: [ + * requires_fcv_46, + * requires_majority_read_concern, + * requires_persistence, + * ] */ (function() { "use strict"; diff --git a/jstests/replsets/snapshot_reads_before_initial_sync_finishes.js b/jstests/replsets/snapshot_reads_before_initial_sync_finishes.js index 63c8c5f9142..77114ab0945 100644 --- a/jstests/replsets/snapshot_reads_before_initial_sync_finishes.js +++ b/jstests/replsets/snapshot_reads_before_initial_sync_finishes.js @@ -2,7 +2,11 @@ * Tests that reading at an atClusterTime earlier than the timestamp when initial sync finishes * would result in SnapshotTooOld error regardless of the snapshot history window. * - * @tags: [requires_majority_read_concern, requires_fcv_46] + * @tags: [ + * requires_fcv_46, + * requires_majority_read_concern, + * requires_persistence, + * ] */ (function() { "use strict"; diff --git a/jstests/sharding/chunk_history_window.js b/jstests/sharding/chunk_history_window.js index 354886b6c2f..7c67bf2de6e 100644 --- a/jstests/sharding/chunk_history_window.js +++ b/jstests/sharding/chunk_history_window.js @@ -4,6 +4,7 @@ * @tags: [ * requires_fcv_46, * requires_majority_read_concern, + * requires_persistence, * ] * * - Create a one-chunk sharded collection, its history is [{validAfter: T0}]. diff --git a/jstests/sharding/non_transaction_snapshot_errors.js b/jstests/sharding/non_transaction_snapshot_errors.js index d5a3cdf1e2e..e80e3badba7 100644 --- a/jstests/sharding/non_transaction_snapshot_errors.js +++ b/jstests/sharding/non_transaction_snapshot_errors.js @@ -11,6 +11,7 @@ * @tags: [ * requires_fcv_46, * requires_majority_read_concern, + * requires_persistence, * ] */ diff --git a/jstests/sharding/non_transaction_snapshot_reads_retry.js b/jstests/sharding/non_transaction_snapshot_reads_retry.js index 07d68480782..6a52d94dbc0 100644 --- a/jstests/sharding/non_transaction_snapshot_reads_retry.js +++ b/jstests/sharding/non_transaction_snapshot_reads_retry.js @@ -5,6 +5,7 @@ * @tags: [ * requires_fcv_46, * requires_majority_read_concern, + * requires_persistence, * ] * * - Create a sharded collection and insert a document. diff --git a/jstests/sharding/sharding_non_transaction_snapshot_aggregate.js b/jstests/sharding/sharding_non_transaction_snapshot_aggregate.js index f35d53faffb..0209783909e 100644 --- a/jstests/sharding/sharding_non_transaction_snapshot_aggregate.js +++ b/jstests/sharding/sharding_non_transaction_snapshot_aggregate.js @@ -4,8 +4,9 @@ * * @tags: [ * requires_fcv_46, + * requires_find_command, * requires_majority_read_concern, - * requires_find_command + * requires_persistence, * ] */ diff --git a/jstests/sharding/sharding_non_transaction_snapshot_read.js b/jstests/sharding/sharding_non_transaction_snapshot_read.js index 7e9e8a9af4b..d7577a134ad 100644 --- a/jstests/sharding/sharding_non_transaction_snapshot_read.js +++ b/jstests/sharding/sharding_non_transaction_snapshot_read.js @@ -3,8 +3,9 @@ * * @tags: [ * requires_fcv_46, + * requires_find_command, * requires_majority_read_concern, - * requires_find_command + * requires_persistence, * ] */ 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 2e8e93c444e..0ee77aa9d3c 100644 --- a/jstests/sharding/snapshot_reads_target_at_point_in_time.js +++ b/jstests/sharding/snapshot_reads_target_at_point_in_time.js @@ -1,11 +1,12 @@ // Verifies mongos uses a versioned routing table to target subsequent requests for snapshot reads. // // @tags: [ +// requires_fcv_46, // requires_find_command, +// requires_persistence, // requires_sharding, // uses_multi_shard_transaction, // uses_transactions, -// requires_fcv_46 // ] (function() { "use strict"; |