SERVER-58574 Modify the setFCV command to set/unset the long names flag

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mongo/db/s/create_collection_coordinator.cpp b/src/mongo/db/s/create_collection_coordinator.cpp
index bd9b4819a6f..5eeb7f09c60 100644
--- a/src/mongo/db/s/create_collection_coordinator.cpp
+++ b/src/mongo/db/s/create_collection_coordinator.cpp
@@ -758,9 +758,17 @@ void CreateCollectionCoordinator::_commit(OperationContext* opCtx) {
 
     coll.setKeyPattern(_shardKeyPattern->getKeyPattern());
 
+    // Prevent the FCV from changing before committing the new collection to the config server. This
+    // ensures that the 'supportingLongName' field is properly set (and committed) based on the
+    // current shard's FCV.
+    //
+    // TODO: Remove once FCV 6.0 becomes last-lts
+    FixedFCVRegion fixedFCVRegion(opCtx);
+
+    // TODO: Remove condition once FCV 6.0 becomes last-lts
     const auto& currentFCV = serverGlobalParams.featureCompatibility;
     if (currentFCV.isGreaterThanOrEqualTo(
-            ServerGlobalParams::FeatureCompatibility::Version::kVersion51)) {
+            ServerGlobalParams::FeatureCompatibility::Version::kUpgradingFrom50To51)) {
         coll.setSupportingLongName(SupportingLongNameStatusEnum::kImplicitlyEnabled);
     }