From daec0b9e752f6881245d154672a407eaa194b110 Mon Sep 17 00:00:00 2001 From: marcobizzarri-mdb Date: Thu, 21 May 2026 08:41:22 +0100 Subject: [PATCH] SERVER-122385 Enable disabled tests due to 8.3 FCV upgrade (#52041) GitOrigin-RevId: bd22fe3f373d8bc810cf50d522b83dae5c5da58b --- .../generated_suites/sharding_last_continuous.yml | 4 ---- .../resmokeconfig/matrix_suites/overrides/multiversion.yml | 5 ----- ...d_shard_fails_promotion_from_lastlts_to_lastcontinuous.js | 5 +++++ ...ct_shard_connection_ddls_during_promotion_to_dedicated.js | 2 ++ .../sharding/direct_shard_connection_ddls_on_replicaset.js | 4 +++- jstests/sharding/replica_set_to_csrs_promotion.js | 5 +++++ 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_last_continuous.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_last_continuous.yml index 3d8458c6d71..3d7eb49d748 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_last_continuous.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_last_continuous.yml @@ -26,10 +26,6 @@ selector: - jstests/sharding/drop_indexes_with_stale_config_error.js - jstests/sharding/query/out_merge/merge_write_concern.js - jstests/sharding/flush_resharding_state_change_errors.js - - jstests/sharding/replica_set_to_csrs_promotion.js - - jstests/sharding/add_shard_fails_promotion_from_lastlts_to_lastcontinuous.js - - jstests/sharding/direct_shard_connection_ddls_on_replicaset.js - - jstests/sharding/direct_shard_connection_ddls_during_promotion_to_dedicated.js exclude_with_any_tags: - multiversion_incompatible - backport_required_multiversion diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/multiversion.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/multiversion.yml index 6b98d9723e7..93b08ee25b5 100644 --- a/buildscripts/resmokeconfig/matrix_suites/overrides/multiversion.yml +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/multiversion.yml @@ -393,11 +393,6 @@ exclude_files: # TODO (SERVER-122386) Re-enable the following tests - jstests/sharding/flush_resharding_state_change_errors.js - # TODO (SERVER-122385) Re-enable the following tests - - jstests/sharding/replica_set_to_csrs_promotion.js - - jstests/sharding/add_shard_fails_promotion_from_lastlts_to_lastcontinuous.js - - jstests/sharding/direct_shard_connection_ddls_on_replicaset.js - - jstests/sharding/direct_shard_connection_ddls_during_promotion_to_dedicated.js - name: sharding_jscore_passthrough_last_continuous_new_old_old_new_excluded_files value: diff --git a/jstests/sharding/add_shard_fails_promotion_from_lastlts_to_lastcontinuous.js b/jstests/sharding/add_shard_fails_promotion_from_lastlts_to_lastcontinuous.js index 853c6867371..e1c70fef810 100644 --- a/jstests/sharding/add_shard_fails_promotion_from_lastlts_to_lastcontinuous.js +++ b/jstests/sharding/add_shard_fails_promotion_from_lastlts_to_lastcontinuous.js @@ -5,6 +5,11 @@ * config_shard_incompatible, * # This restriction was introduced in binary v8.3. * requires_fcv_83, + * # The test drives the cluster through lastLTS -> lastContinuous -> latest FCV transitions + * # using setFeatureCompatibilityVersion: latestFCV. In multiversion suites where mongos is on + * # the last-continuous binary, latestFCV is not reachable. The body also requires the new shard + * # to start at lastLTSFCV, which is not guaranteed when nodes get random binaries. + * multiversion_incompatible, * ] */ import {afterEach, beforeEach, describe, it} from "jstests/libs/mochalite.js"; diff --git a/jstests/sharding/direct_shard_connection_ddls_during_promotion_to_dedicated.js b/jstests/sharding/direct_shard_connection_ddls_during_promotion_to_dedicated.js index 0694b27f44d..59c2e7f3b17 100644 --- a/jstests/sharding/direct_shard_connection_ddls_during_promotion_to_dedicated.js +++ b/jstests/sharding/direct_shard_connection_ddls_during_promotion_to_dedicated.js @@ -4,6 +4,8 @@ * # The test caches authenticated connections, so we do not support stepdowns * does_not_support_stepdowns, * requires_fcv_83, + * # The test is not compatible with multiversion + * multiversion_incompatible, * # The test creates a sharded cluster with a dedicated config server, so the test is incompatible with fixtures with embedded config servers * config_shard_incompatible, * ] diff --git a/jstests/sharding/direct_shard_connection_ddls_on_replicaset.js b/jstests/sharding/direct_shard_connection_ddls_on_replicaset.js index a91bc9a991d..28c8587a002 100644 --- a/jstests/sharding/direct_shard_connection_ddls_on_replicaset.js +++ b/jstests/sharding/direct_shard_connection_ddls_on_replicaset.js @@ -3,7 +3,9 @@ * @tags: [ * # The test caches authenticated connections, so we do not support stepdowns * does_not_support_stepdowns, - * requires_fcv_83 + * requires_fcv_83, + * # The test is not compatible with multiversion + * multiversion_incompatible, * ] */ diff --git a/jstests/sharding/replica_set_to_csrs_promotion.js b/jstests/sharding/replica_set_to_csrs_promotion.js index d7477bcaf47..0b2513d62f4 100644 --- a/jstests/sharding/replica_set_to_csrs_promotion.js +++ b/jstests/sharding/replica_set_to_csrs_promotion.js @@ -2,6 +2,11 @@ * @tags: [ * requires_persistence, * requires_fcv_83, + * # The test exercises replicaSetConfigShardMaintenanceMode and FCV transitions, both of + * # which require all participating binaries to be 8.3+. In multiversion suites with mixed + * # binaries the FCV after initiate() is driven down to lastLTSFCV, making these scenarios + * # impossible to validate. + * multiversion_incompatible, * ] */ import {afterEach, before, beforeEach, describe, it} from "jstests/libs/mochalite.js";