From 0adedd4f48d17bc64124c77acd3cbc42ed709dec Mon Sep 17 00:00:00 2001 From: Jordi Olivares Provencio Date: Thu, 21 May 2026 10:26:54 +0200 Subject: [PATCH] SERVER-122957 Fix the feature flag checks as it conflicted with the bulk rename and it used a new process (#54155) GitOrigin-RevId: 8586e253494e6ea4fb613bccc56b989cfed5b76a --- .../ddl/rename_collection_coordinator.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp b/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp index 6bf32d5e8ae..0bcb67c8c9e 100644 --- a/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp +++ b/src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp @@ -817,9 +817,9 @@ ExecutorFuture RenameCollectionCoordinator::_runImpl( // for updating the shard catalog with current information. This flag is // evaluated at insertion time because on secondaries, metadata is cleared // during the onDelete of the critical section document. - if (feature_flags::gAuthoritativeShardsDDL.isEnabled( - VersionContext::getDecoration(opCtx), - serverGlobalParams.featureCompatibility.acquireFCVSnapshot())) { + bool isDDLAuthoritative = _doc.getAuthoritativeMetadataAccessLevel() >= + AuthoritativeMetadataAccessLevelEnum::kWritesAllowed; + if (isDDLAuthoritative) { blockCRUDOperationsRequest.setClearCollMetadata(false); } @@ -945,9 +945,9 @@ ExecutorFuture RenameCollectionCoordinator::_runImpl( // for updating the shard catalog with current information. This flag is // evaluated at insertion time because on secondaries, metadata is cleared // during the onDelete of the critical section document. - if (feature_flags::gAuthoritativeShardsDDL.isEnabled( - VersionContext::getDecoration(opCtx), - serverGlobalParams.featureCompatibility.acquireFCVSnapshot())) { + bool isDDLAuthoritative = _doc.getAuthoritativeMetadataAccessLevel() >= + AuthoritativeMetadataAccessLevelEnum::kWritesAllowed; + if (isDDLAuthoritative) { renameCollParticipantRequest.setClearCollMetadata(false); } @@ -1049,9 +1049,9 @@ ExecutorFuture RenameCollectionCoordinator::_runImpl( session); } - if (feature_flags::gAuthoritativeShardsDDL.isEnabled( - VersionContext::getDecoration(opCtx), - serverGlobalParams.featureCompatibility.acquireFCVSnapshot())) { + bool isDDLAuthoritative = _doc.getAuthoritativeMetadataAccessLevel() >= + AuthoritativeMetadataAccessLevelEnum::kWritesAllowed; + if (isDDLAuthoritative) { const auto session = getNewSession(opCtx); sharding_ddl_util::commitRenameCollectionMetadataToShardCatalog( opCtx,