SERVER-56399 Configsvr step-up can fail after stepping-down during setFCV metadata patch-up

1 files changed, 15 insertions, 10 deletions

diff --git a/src/mongo/db/s/config/sharding_catalog_manager.cpp b/src/mongo/db/s/config/sharding_catalog_manager.cpp
index 813c6f3d0d3..a13ddcdcabc 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager.cpp
@@ -446,17 +446,22 @@ Status ShardingCatalogManager::_initConfigIndexes(OperationContext* opCtx) {
     const bool unique = true;
     auto configShard = Grid::get(opCtx)->shardRegistry()->getConfigShard();
 
-    if (feature_flags::gShardingFullDDLSupportTimestampedVersion.isEnabled(
-            serverGlobalParams.featureCompatibility)) {
-        const auto result = createUuidIndexesForConfigChunks(opCtx);
-        if (result != Status::OK()) {
-            return result;
-        }
+    // (Generic FCV reference): TODO SERVER-53283 Remove the outermost 'if' statement once 5.0 has
+    // branched out.
+    if (!serverGlobalParams.featureCompatibility.isUpgradingOrDowngrading() ||
+        !feature_flags::gShardingFullDDLSupportTimestampedVersion.isEnabledAndIgnoreFCV()) {
+        if (feature_flags::gShardingFullDDLSupportTimestampedVersion.isEnabled(
+                serverGlobalParams.featureCompatibility)) {
+            const auto result = createUuidIndexesForConfigChunks(opCtx);
+            if (result != Status::OK()) {
+                return result;
+            }
 
-    } else {
-        const auto result = createNsIndexesForConfigChunks(opCtx);
-        if (result != Status::OK()) {
-            return result;
+        } else {
+            const auto result = createNsIndexesForConfigChunks(opCtx);
+            if (result != Status::OK()) {
+                return result;
+            }
         }
     }