diff options
author | Jordi Olivares Provencio <jordi.olivares-provencio@mongodb.com> | 2022-02-15 09:51:55 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-15 10:20:55 +0000 |
commit | af5c018cf1c5a907c8f692b49b05b2c155be2a08 (patch) | |
tree | 8c48dc4975a4095c927a77b6bec0e030df05575a | |
parent | e99d7c8b9d71a1cca30166828392d614ac2905a7 (diff) | |
download | mongo-af5c018cf1c5a907c8f692b49b05b2c155be2a08.tar.gz |
SERVER-62963 remove requires_timeseries exclusion from concurrency_sharded_*
18 files changed, 38 insertions, 39 deletions
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml index 2c3b1156810..83467144c4c 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml @@ -94,8 +94,6 @@ selector: - uses_curop_agg_stage # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - assumes_unsharded_collection executor: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml index 96a988bcec7..3bfbf5175bd 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml @@ -103,8 +103,6 @@ selector: - uses_curop_agg_stage # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - assumes_unsharded_collection executor: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml index 5b3e68eb8e1..18452678c0c 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml @@ -176,8 +176,6 @@ selector: - requires_non_retryable_writes # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_stepdowns - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml index 688bc0bd7c4..8c2e7e5f72b 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml @@ -138,8 +138,6 @@ selector: - catches_command_failures # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_transactions - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml index 0f10b1279f8..9f95289a04a 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml @@ -141,8 +141,6 @@ selector: - catches_command_failures # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_transactions - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml index d34b979493f..f1ebb664fa7 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml @@ -141,8 +141,6 @@ selector: - catches_command_failures # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_transactions - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml index b718dd3a0cf..87953225a11 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml @@ -212,8 +212,6 @@ selector: - operations_longer_than_stepdown_interval_in_txns # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_transactions - does_not_support_stepdowns - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml index 5874c4b51bc..b4d0f80926b 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml @@ -212,8 +212,6 @@ selector: - operations_longer_than_stepdown_interval_in_txns # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_transactions - does_not_support_stepdowns - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml index 9da28cde1ad..7634a48b437 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml @@ -141,8 +141,6 @@ selector: - catches_command_failures # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_transactions - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml index e93cbeddb6d..84e3306cb33 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml @@ -193,8 +193,6 @@ selector: - operations_longer_than_stepdown_interval_in_txns # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_transactions - does_not_support_stepdowns - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml index 1b2c1ec1f52..8d48ee9e9f1 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml @@ -99,8 +99,6 @@ selector: - assumes_balancer_on # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - assumes_unsharded_collection executor: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml index 643584dfbe5..0d104100f9d 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml @@ -105,8 +105,6 @@ selector: - requires_replication # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - assumes_unsharded_collection executor: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml index 2be7abcb0de..41e0539bbc3 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml @@ -176,8 +176,6 @@ selector: - requires_non_retryable_writes # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_stepdowns - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml index c6e49f6b22f..fe148c981c7 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml @@ -165,8 +165,6 @@ selector: - uses_curop_agg_stage # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_stepdowns - assumes_unsharded_collection diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml index bcc4ebc5c5c..f4e9fad96fc 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml @@ -173,8 +173,6 @@ selector: - uses_curop_agg_stage # mongos has no system.profile collection. - requires_profiling - # mongos does not support inserts on timeseries collections - - requires_timeseries - does_not_support_stepdowns - assumes_unsharded_collection diff --git a/jstests/concurrency/fsm_workloads/find_cmd_with_indexes_timeseries.js b/jstests/concurrency/fsm_workloads/find_cmd_with_indexes_timeseries.js index eebd473d707..901b4552000 100644 --- a/jstests/concurrency/fsm_workloads/find_cmd_with_indexes_timeseries.js +++ b/jstests/concurrency/fsm_workloads/find_cmd_with_indexes_timeseries.js @@ -12,6 +12,8 @@ * * @tags: [ * requires_timeseries, + * # Cannot create indexes on a non-empty timeseries collection during a transaction. + * does_not_support_transactions * ] */ diff --git a/jstests/concurrency/fsm_workloads/timeseries_insert_idle_bucket_expiration.js b/jstests/concurrency/fsm_workloads/timeseries_insert_idle_bucket_expiration.js index 96fbe78f02c..b3360afd188 100644 --- a/jstests/concurrency/fsm_workloads/timeseries_insert_idle_bucket_expiration.js +++ b/jstests/concurrency/fsm_workloads/timeseries_insert_idle_bucket_expiration.js @@ -6,6 +6,8 @@ * * @tags: [ * requires_timeseries, + * # Timeseries do not support multi-document transactions with inserts. + * does_not_support_transactions, * ] */ @@ -14,6 +16,10 @@ var $config = (function() { const metaFieldName = 'tag'; const numDocs = 100; + function getCollectionName(collName) { + return jsTestName() + "_" + collName; + } + const insert = function(db, collName, tid, ordered) { const docs = []; for (let i = 0; i < numDocs; ++i) { @@ -28,16 +34,19 @@ var $config = (function() { const states = { init: function(db, collName) {}, - insertOrdered: function(db, collName) { + insertOrdered: function(db, collNameSuffix) { + let collName = getCollectionName(collNameSuffix); insert(db, collName, this.tid, true); }, - insertUnordered: function(db, collName) { + insertUnordered: function(db, collNameSuffix) { + let collName = getCollectionName(collNameSuffix); insert(db, collName, this.tid, false); }, }; - const setup = function(db, collName, cluster) { + const setup = function(db, collNameSuffix, cluster) { + let collName = getCollectionName(collNameSuffix); cluster.executeOnMongodNodes((db) => { assert.commandWorked(db.adminCommand( {setParameter: 1, timeseriesIdleBucketExpiryMemoryUsageThreshold: 1024})); @@ -47,8 +56,12 @@ var $config = (function() { collName, {timeseries: {timeField: timeFieldName, metaField: metaFieldName}})); }; - const teardown = function(db, collName, cluster) { - jsTestLog(db.serverStatus().bucketCatalog); + const teardown = function(db, collNameSuffix, cluster) { + let collName = getCollectionName(collNameSuffix); + const bucketCatalog = db.serverStatus().bucketCatalog; + if (bucketCatalog !== undefined) { + jsTestLog(bucketCatalog); + } jsTestLog(db.runCommand({collStats: collName}).timeseries); cluster.executeOnMongodNodes((db) => { diff --git a/jstests/concurrency/fsm_workloads/timeseries_insert_kill_op.js b/jstests/concurrency/fsm_workloads/timeseries_insert_kill_op.js index 71732f2f831..ebd6e8253ff 100644 --- a/jstests/concurrency/fsm_workloads/timeseries_insert_kill_op.js +++ b/jstests/concurrency/fsm_workloads/timeseries_insert_kill_op.js @@ -5,6 +5,12 @@ * * @tags: [ * requires_timeseries, + * # killOp does not support stepdowns. + * does_not_support_stepdowns, + * # Timeseries do not support multi-document transactions with inserts. + * does_not_support_transactions, + * # Kill operations do not propagate for writes on mongos. + * assumes_unsharded_collection * ] */ @@ -12,6 +18,10 @@ var $config = (function() { const timeFieldName = 'time'; const metaFieldName = 'tag'; + function getCollectionName(collName) { + return jsTestName() + "_" + collName; + } + const insert = function(db, collName, ordered) { const docs = []; for (let i = 0; i < 1000; ++i) { @@ -31,15 +41,18 @@ var $config = (function() { const states = { init: function(db, collName) {}, - insertOrdered: function(db, collName) { + insertOrdered: function(db, collNameSuffix) { + let collName = getCollectionName(collNameSuffix); insert(db, collName, true); }, - insertUnordered: function(db, collName) { + insertUnordered: function(db, collNameSuffix) { + let collName = getCollectionName(collNameSuffix); insert(db, collName, false); }, - killInsert: function(db, collName) { + killInsert: function(db, collNameSuffix) { + let collName = getCollectionName(collNameSuffix); const inprog = assert.commandWorked(db.currentOp({ns: db[collName].getFullName(), op: 'insert'})) .inprog; @@ -50,7 +63,8 @@ var $config = (function() { }, }; - const setup = function(db, collName) { + const setup = function(db, collNameSuffix) { + let collName = getCollectionName(collNameSuffix); assert.commandWorked(db.createCollection( collName, {timeseries: {timeField: timeFieldName, metaField: metaFieldName}})); }; |