diff options
11 files changed, 13 insertions, 10 deletions
diff --git a/buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml index 17d04f3ab1e..cdcd52a7d6e 100644 --- a/buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_merge_causally_consistent_jscore_passthrough.yml @@ -253,6 +253,7 @@ selector: - requires_multi_updates - requires_timeseries # Tenant migration, transactions not supported - requires_fastcount + - multiple_tenants_incompatible executor: archive: diff --git a/buildscripts/resmokeconfig/suites/shard_merge_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_merge_jscore_passthrough.yml index 32a53191127..9153cafd464 100644 --- a/buildscripts/resmokeconfig/suites/shard_merge_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_merge_jscore_passthrough.yml @@ -41,6 +41,7 @@ selector: - tenant_migration_incompatible - requires_timeseries # Tenant migration not supported - requires_fastcount + - multiple_tenants_incompatible executor: archive: diff --git a/buildscripts/resmokeconfig/suites/shard_merge_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_merge_multi_stmt_txn_jscore_passthrough.yml index dc851f90788..3e828cd5829 100644 --- a/buildscripts/resmokeconfig/suites/shard_merge_multi_stmt_txn_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_merge_multi_stmt_txn_jscore_passthrough.yml @@ -253,6 +253,7 @@ selector: - requires_multi_updates - requires_timeseries # Tenant migration, transactions not supported - requires_fastcount + - multiple_tenants_incompatible executor: archive: diff --git a/buildscripts/resmokeconfig/suites/shard_split_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_causally_consistent_jscore_passthrough.yml index bf4dc291368..6b5af0d8529 100644 --- a/buildscripts/resmokeconfig/suites/shard_split_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_split_causally_consistent_jscore_passthrough.yml @@ -106,7 +106,7 @@ selector: # Full validation can cause ongoing queries to fail. This can affect the shard split process. - uses_full_validation - tenant_migration_incompatible - - shard_split_incompatible + - multiple_tenants_incompatible - requires_timeseries # Tenant migration not supported executor: diff --git a/buildscripts/resmokeconfig/suites/shard_split_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_jscore_passthrough.yml index 6070d416293..bbf4f369ee4 100644 --- a/buildscripts/resmokeconfig/suites/shard_split_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_split_jscore_passthrough.yml @@ -41,7 +41,7 @@ selector: # Full validation can cause ongoing queries to fail. This can affect the shard split process. - uses_full_validation - tenant_migration_incompatible - - shard_split_incompatible + - multiple_tenants_incompatible - requires_timeseries # Tenant migration not supported executor: diff --git a/buildscripts/resmokeconfig/suites/shard_split_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_kill_primary_jscore_passthrough.yml index 1d93867d4b4..b25bda49b40 100644 --- a/buildscripts/resmokeconfig/suites/shard_split_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_split_kill_primary_jscore_passthrough.yml @@ -122,7 +122,7 @@ selector: - assumes_write_concern_unchanged # Full validation can cause ongoing queries to fail. This can affect the shard split process. - uses_full_validation - - shard_split_incompatible + - multiple_tenants_incompatible - requires_timeseries # Tenant migration not supported executor: diff --git a/buildscripts/resmokeconfig/suites/shard_split_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_multi_stmt_txn_jscore_passthrough.yml index b22558cac6a..f6a94169ea9 100644 --- a/buildscripts/resmokeconfig/suites/shard_split_multi_stmt_txn_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_split_multi_stmt_txn_jscore_passthrough.yml @@ -247,7 +247,7 @@ selector: - uses_full_validation # Multi-updates that conflict with shard split are not retried by inject_tenant_prefix.js. - requires_multi_updates - - shard_split_incompatible + - multiple_tenants_incompatible - requires_timeseries # Tenant migration, transactions not supported executor: diff --git a/buildscripts/resmokeconfig/suites/shard_split_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_stepdown_jscore_passthrough.yml index 32493873cd2..eef468bda3e 100644 --- a/buildscripts/resmokeconfig/suites/shard_split_stepdown_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_split_stepdown_jscore_passthrough.yml @@ -114,7 +114,7 @@ selector: - assumes_write_concern_unchanged # Full validation can cause ongoing queries to fail. This can affect the shard split process. - uses_full_validation - - shard_split_incompatible + - multiple_tenants_incompatible - requires_timeseries # Tenant migration not supported executor: diff --git a/buildscripts/resmokeconfig/suites/shard_split_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/shard_split_terminate_primary_jscore_passthrough.yml index 8385be7165a..8b4e5132be9 100644 --- a/buildscripts/resmokeconfig/suites/shard_split_terminate_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/shard_split_terminate_primary_jscore_passthrough.yml @@ -114,7 +114,7 @@ selector: - assumes_write_concern_unchanged # Full validation can cause ongoing queries to fail. This can affect the shard split process. - uses_full_validation - - shard_split_incompatible + - multiple_tenants_incompatible - requires_timeseries # Tenant migration not supported executor: diff --git a/jstests/core/dbcase.js b/jstests/core/dbcase.js index 6aafbcb250d..23b5bccd305 100644 --- a/jstests/core/dbcase.js +++ b/jstests/core/dbcase.js @@ -1,8 +1,8 @@ // Check db name duplication constraint SERVER-2111 // @tags: [ -// # The inject_tenant_prefix override in shard split mode might choose different +// # The inject_tenant_prefix override in multi-tenant mode might choose different // # prefixes for each sibling DB in this test. -// shard_split_incompatible, +// multiple_tenants_incompatible, // ] a = db.getSiblingDB("dbcasetest_dbnamea"); diff --git a/jstests/core/dbcase2.js b/jstests/core/dbcase2.js index 2fb5ff2eec9..ef94dc15f99 100644 --- a/jstests/core/dbcase2.js +++ b/jstests/core/dbcase2.js @@ -1,9 +1,9 @@ // SERVER-2111 Check that an in memory db name will block creation of a db with a similar but // differently cased name. // @tags: [ -// # The inject_tenant_prefix override in shard split mode might choose different +// # The inject_tenant_prefix override in multi-tenant mode might choose different // # prefixes for each sibling DB in this test. -// shard_split_incompatible, +// multiple_tenants_incompatible, // ] var dbLowerCase = db.getSiblingDB("dbcase2test_dbnamea"); |