mongodb/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-125563 Enable featureFlagReshardingRegistry (#52767)

Browse Source 
GitOrigin-RevId: 7542f49db69d144dd1373f7d0a2836f137422d2a
This commit is contained in:
Brett Nawrocki 2026-04-28 17:07:33 -04:00 committed by MongoDB Bot
parent f3b36f638d
commit 7971eb4379
6 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jstests/sharding/range_deleter_pauses_during_resharding.js
View File

@ -2,8 +2,8 @@
* Tests that range deletion tasks for a collection actively undergoing resharding are not executed.
*
* @tags: [
* requires_fcv_81,
* featureFlagReshardingRegistry,
* requires_fcv_90,
* resource_intensive,
* ]
*/

2
src/mongo/db/s/resharding/resharding_coordinator_service_util_test.cpp
View File

@ -307,7 +307,6 @@ TEST_F(ReshardingCoordinatorServiceUtilTest,
}
TEST_F(ReshardingCoordinatorServiceUtilTest, RegistryPathThrowsWhenReshardingUUIDNotFound) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
ASSERT_THROWS_CODE(retrieveReshardingUUID(opCtx.get(), kSourceNss),
@ -316,7 +315,6 @@ TEST_F(ReshardingCoordinatorServiceUtilTest, RegistryPathThrowsWhenReshardingUUI
}
TEST_F(ReshardingCoordinatorServiceUtilTest, RegistryPathReturnsReshardingUUID) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto reshardingUUID = UUID::gen();
auto meta = makeMetadata(reshardingUUID);

4
src/mongo/db/s/resharding/resharding_destined_recipient_test.cpp
View File

@ -159,8 +159,8 @@ public:
ShardType("shard1", "Host1:12345")};
void setUp() override {
if (GetParam()) {
_featureFlagScope.emplace("featureFlagReshardingRegistry", true);
if (!GetParam()) {
_featureFlagScope.emplace("featureFlagReshardingRegistry", false);
}
ShardServerTestFixtureWithCatalogCacheLoaderMock::setUp();

15
src/mongo/db/s/resharding/resharding_op_observer_test.cpp
View File

@ -155,7 +155,6 @@ protected:
};
TEST_F(ReshardingOpObserverRegistryTest, InsertCoordinatorDocRegistersCoordinatorRole) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
auto doc = makeCoordinatorDocBson(metadata);
@ -171,7 +170,6 @@ TEST_F(ReshardingOpObserverRegistryTest, InsertCoordinatorDocRegistersCoordinato
}
TEST_F(ReshardingOpObserverRegistryTest, InsertDonorDocRegistersDonorRole) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
auto doc = makeDonorDocBson(metadata);
@ -186,7 +184,6 @@ TEST_F(ReshardingOpObserverRegistryTest, InsertDonorDocRegistersDonorRole) {
}
TEST_F(ReshardingOpObserverRegistryTest, InsertRecipientDocRegistersRecipientRole) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
auto doc = makeRecipientDocBson(metadata);
@ -201,7 +198,6 @@ TEST_F(ReshardingOpObserverRegistryTest, InsertRecipientDocRegistersRecipientRol
}
TEST_F(ReshardingOpObserverRegistryTest, InsertUnrelatedCollectionDoesNotRegister) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
auto doc = makeCoordinatorDocBson(metadata);
@ -213,7 +209,6 @@ TEST_F(ReshardingOpObserverRegistryTest, InsertUnrelatedCollectionDoesNotRegiste
}
TEST_F(ReshardingOpObserverRegistryTest, InsertMultipleRolesRegistersAll) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
@ -236,7 +231,6 @@ TEST_F(ReshardingOpObserverRegistryTest, InsertMultipleRolesRegistersAll) {
}
TEST_F(ReshardingOpObserverRegistryTest, InsertDuplicateIsNoOp) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
auto doc = makeCoordinatorDocBson(metadata);
@ -251,7 +245,6 @@ TEST_F(ReshardingOpObserverRegistryTest, InsertDuplicateIsNoOp) {
}
TEST_F(ReshardingOpObserverRegistryTest, DeleteCoordinatorDocUnregistersCoordinatorRole) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
@ -266,7 +259,6 @@ TEST_F(ReshardingOpObserverRegistryTest, DeleteCoordinatorDocUnregistersCoordina
}
TEST_F(ReshardingOpObserverRegistryTest, DeleteRecipientDocUnregistersRecipientRole) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
@ -281,7 +273,6 @@ TEST_F(ReshardingOpObserverRegistryTest, DeleteRecipientDocUnregistersRecipientR
}
TEST_F(ReshardingOpObserverRegistryTest, DeleteOneRoleLeavesOtherRoles) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
@ -298,7 +289,6 @@ TEST_F(ReshardingOpObserverRegistryTest, DeleteOneRoleLeavesOtherRoles) {
}
TEST_F(ReshardingOpObserverRegistryTest, DeleteUnrelatedCollectionDoesNotUnregister) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
@ -314,7 +304,6 @@ TEST_F(ReshardingOpObserverRegistryTest, DeleteUnrelatedCollectionDoesNotUnregis
}
TEST_F(ReshardingOpObserverRegistryTest, InsertThenDeleteLifecycle) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
auto doc = makeCoordinatorDocBson(metadata);
@ -327,7 +316,6 @@ TEST_F(ReshardingOpObserverRegistryTest, InsertThenDeleteLifecycle) {
}
TEST_F(ReshardingOpObserverRegistryTest, DeleteNonExistentOperationIsNoOp) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
auto doc = makeCoordinatorDocBson(metadata);
@ -337,7 +325,6 @@ TEST_F(ReshardingOpObserverRegistryTest, DeleteNonExistentOperationIsNoOp) {
}
TEST_F(ReshardingOpObserverRegistryTest, UpdateCoordinatorDocToQuiescedUnregistersCoordinator) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
@ -354,7 +341,6 @@ TEST_F(ReshardingOpObserverRegistryTest, UpdateCoordinatorDocToQuiescedUnregiste
}
TEST_F(ReshardingOpObserverRegistryTest, UpdateCoordinatorDocToNonQuiescedDoesNotUnregister) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata = makeMetadata();
@ -373,7 +359,6 @@ TEST_F(ReshardingOpObserverRegistryTest, UpdateCoordinatorDocToNonQuiescedDoesNo
}
TEST_F(ReshardingOpObserverRegistryTest, QuiescedCoordinatorThenNewOperationLifecycle) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto opCtx = makeOperationContext();
auto metadata1 = makeMetadata();

9
src/mongo/db/s/resharding/sharding_write_router_test.cpp
View File

@ -228,14 +228,12 @@ protected:
};
TEST_F(ShardingWriteRouterRegistryTest, NoReshardingOperationReturnsNone) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto router = makeRouter();
auto result = router.getReshardingDestinedRecipient(BSON("_id" << 0 << "y" << 5));
ASSERT_FALSE(result.has_value());
}
TEST_F(ShardingWriteRouterRegistryTest, OnlyRecipientRoleReturnsNone) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto& registry = LocalReshardingOperationsRegistry::get();
auto metadata = makeMetadata();
registry.registerOperation(LocalReshardingOperationsRegistry::Role::kRecipient, metadata);
@ -246,7 +244,6 @@ TEST_F(ShardingWriteRouterRegistryTest, OnlyRecipientRoleReturnsNone) {
}
TEST_F(ShardingWriteRouterRegistryTest, OnlyCoordinatorRoleReturnsNone) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto& registry = LocalReshardingOperationsRegistry::get();
auto metadata = makeMetadata();
registry.registerOperation(LocalReshardingOperationsRegistry::Role::kCoordinator, metadata);
@ -257,7 +254,6 @@ TEST_F(ShardingWriteRouterRegistryTest, OnlyCoordinatorRoleReturnsNone) {
}
TEST_F(ShardingWriteRouterRegistryTest, DonorRoleRegisteredReturnsShardId) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto& registry = LocalReshardingOperationsRegistry::get();
auto metadata = makeMetadata();
registry.registerOperation(LocalReshardingOperationsRegistry::Role::kDonor, metadata);
@ -269,7 +265,6 @@ TEST_F(ShardingWriteRouterRegistryTest, DonorRoleRegisteredReturnsShardId) {
}
TEST_F(ShardingWriteRouterRegistryTest, DonorAndRecipientRolesReturnsShardId) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto& registry = LocalReshardingOperationsRegistry::get();
auto metadata = makeMetadata();
registry.registerOperation(LocalReshardingOperationsRegistry::Role::kDonor, metadata);
@ -282,7 +277,6 @@ TEST_F(ShardingWriteRouterRegistryTest, DonorAndRecipientRolesReturnsShardId) {
}
TEST_F(ShardingWriteRouterRegistryTest, OperationUnregisteredReturnsNone) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto& registry = LocalReshardingOperationsRegistry::get();
auto metadata = makeMetadata();
registry.registerOperation(LocalReshardingOperationsRegistry::Role::kDonor, metadata);
@ -294,7 +288,6 @@ TEST_F(ShardingWriteRouterRegistryTest, OperationUnregisteredReturnsNone) {
}
TEST_F(ShardingWriteRouterRegistryTest, DifferentNamespaceReturnsNone) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
auto& registry = LocalReshardingOperationsRegistry::get();
auto metadata = makeMetadata();
registry.registerOperation(LocalReshardingOperationsRegistry::Role::kDonor, metadata);
@ -320,7 +313,6 @@ TEST_F(ShardingWriteRouterRegistryTest, DifferentNamespaceReturnsNone) {
}
TEST_F(ShardingWriteRouterRegistryTest, NotShardServerReturnsNone) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
serverGlobalParams.clusterRole = ClusterRole::None;
const auto client = _serviceContext->getService()->makeClient("test-non-shard");
@ -334,7 +326,6 @@ TEST_F(ShardingWriteRouterRegistryTest, NotShardServerReturnsNone) {
}
TEST_F(ShardingWriteRouterRegistryTest, CollDescHasNoRoutingTableReturnsNone) {
RAIIServerParameterControllerForTest featureFlagScope{"featureFlagReshardingRegistry", true};
const auto untrackedNss =
NamespaceString::createNamespaceString_forTest("test", "unsharded_coll");

4
src/mongo/s/resharding/resharding_feature_flag.idl
View File

@ -144,9 +144,9 @@ feature_flags:
"Feature flag to enable consulting the LocalReshardingOperationRegistry instead
of reshardingFields on config.collections entries."
cpp_varname: gFeatureFlagReshardingRegistry
default: false
default: true
version: 9.0
fcv_gated: true
check_against_fcv: legacy_fcv_snapshot_only
featureFlagReshardingRemainingTimeEstimateBasedOnMovingAverage:
mod_visibility: public
description: