diff options
| author | Suganthi Mani <suganthi.mani@mongodb.com> | 2023-03-17 03:03:16 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-03-17 04:11:13 +0000 |
| commit | 8604298838c4d2e4414b9b90c13a5af85fe05d96 (patch) | |
| tree | 688d31d97db2df047fded24c189360a90692c747 /jstests/multiVersion/genericSetFCVUsage | |
| parent | 9c5cc01a012b602d72d0c56148da04a6e95699a9 (diff) | |
| download | mongo-8604298838c4d2e4414b9b90c13a5af85fe05d96.tar.gz | |
SERVER-73397 New shard merge recipient POS instance, along with test changes.
Diffstat (limited to 'jstests/multiVersion/genericSetFCVUsage')
3 files changed, 10 insertions, 1 deletions
diff --git a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch.js b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch.js index 8c924efe732..c11f570e735 100644 --- a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch.js +++ b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch.js @@ -8,6 +8,7 @@ */ import {TenantMigrationTest} from "jstests/replsets/libs/tenant_migration_test.js"; +import {isShardMergeEnabled} from "jstests/replsets/libs/tenant_migration_util.js"; load("jstests/libs/fail_point_util.js"); load("jstests/libs/uuid_util.js"); // for 'extractUUIDFromObject' load("jstests/libs/parallelTester.js"); // for 'Thread' @@ -46,7 +47,11 @@ function runTest(downgradeFCV) { hangAfterSavingFCV.off(); // Make sure we see the FCV mismatch detection message on the recipient. - checkLog.containsJson(recipientPrimary, 5382300); + if (isShardMergeEnabled(recipientDB)) { + checkLog.containsJson(recipientPrimary, 7339749); + } else { + checkLog.containsJson(recipientPrimary, 5382300); + } // Upgrade again to check on the status of the migration from the donor's point of view. assert.commandWorked(donorPrimary.adminCommand({setFeatureCompatibilityVersion: latestFCV})); diff --git a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch_after_failover.js b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch_after_failover.js index 4e40d7e5c3f..191c1e7a802 100644 --- a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch_after_failover.js +++ b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch_after_failover.js @@ -4,6 +4,8 @@ * @tags: [ * requires_majority_read_concern, * incompatible_with_windows_tls, + * # Shard merge is not robust to failovers and restarts. + * incompatible_with_shard_merge, * serverless, * ] */ diff --git a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js index 2a88f62439b..16735b65a93 100644 --- a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js +++ b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_save_fcv.js @@ -4,6 +4,8 @@ * @tags: [ * requires_majority_read_concern, * incompatible_with_windows_tls, + * # Shard merge is not robust to failovers and restarts. + * incompatible_with_shard_merge, * serverless, * ] */ |