diff options
author | mathisbessamdb <mathis.bessa@mongodb.com> | 2022-09-08 21:10:02 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-08 22:25:42 +0000 |
commit | f96e9b53074942f596273b4d9d7b96a808bd8b4e (patch) | |
tree | 0c0badabb54b9947caa0a70d436b7827e818cad1 /jstests | |
parent | 7a3301774c0c3031ac724c25e24f005d45de4320 (diff) | |
download | mongo-f96e9b53074942f596273b4d9d7b96a808bd8b4e.tar.gz |
SERVER-69524 Fix jstest running secondary read preference for shard merge
Diffstat (limited to 'jstests')
2 files changed, 13 insertions, 0 deletions
diff --git a/jstests/replsets/tenant_migration_conflicting_donor_start_migration_cmds.js b/jstests/replsets/tenant_migration_conflicting_donor_start_migration_cmds.js index ed21502a4b4..41c0d69c549 100644 --- a/jstests/replsets/tenant_migration_conflicting_donor_start_migration_cmds.js +++ b/jstests/replsets/tenant_migration_conflicting_donor_start_migration_cmds.js @@ -335,6 +335,11 @@ function testConcurrentConflictingMigrations({ // Test different cloning read preference. (() => { + if (TenantMigrationUtil.isShardMergeEnabled(donorPrimary.getDB("admin"))) { + jsTestLog( + "Skip: featureFlagShardMerge is enabled and this test tests migration's secondary read preference."); + return; + } const makeTestParams = () => { const migrationOpts0 = { migrationIdString: extractUUIDFromObject(UUID()), diff --git a/jstests/replsets/tenant_migration_recipient_fetches_retryable_writes_entry_after_committed_snapshot.js b/jstests/replsets/tenant_migration_recipient_fetches_retryable_writes_entry_after_committed_snapshot.js index 4643b6069d3..7d5745bd566 100644 --- a/jstests/replsets/tenant_migration_recipient_fetches_retryable_writes_entry_after_committed_snapshot.js +++ b/jstests/replsets/tenant_migration_recipient_fetches_retryable_writes_entry_after_committed_snapshot.js @@ -74,6 +74,14 @@ const donorPrimary = donorRst.getPrimary(); const tenantMigrationTest = new TenantMigrationTest({name: jsTestName(), donorRst: donorRst}); +if (TenantMigrationUtil.isShardMergeEnabled(donorPrimary.getDB("admin"))) { + jsTestLog( + "Skip: incompatible with featureFlagShardMerge. Only 'primary' read preference is supported."); + donorRst.stopSet(); + tenantMigrationTest.stop(); + return; +} + const recipientPrimary = tenantMigrationTest.getRecipientPrimary(); const kTenantId = "testTenantId"; const migrationId = UUID(); |