SERVER-40882 Restore the --noIndexBuildRetry server parameter flag and the storage.indexBuildRetry config file option

1 files changed, 18 insertions, 0 deletions

diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 62d28f73b50..cdbff5a8d20 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -243,6 +243,20 @@ Status canonicalizeMongodOptions(moe::Environment* params) {
         }
     }
 
+    // "storage.indexBuildRetry" comes from the config file, so override it if "noIndexBuildRetry"
+    // is set since that comes from the command line.
+    if (params->count("noIndexBuildRetry")) {
+        Status ret = params->set("storage.indexBuildRetry",
+                                 moe::Value(!(*params)["noIndexBuildRetry"].as<bool>()));
+        if (!ret.isOK()) {
+            return ret;
+        }
+        ret = params->remove("noIndexBuildRetry");
+        if (!ret.isOK()) {
+            return ret;
+        }
+    }
+
     // "sharding.clusterRole" comes from the config file, so override it if "configsvr" or
     // "shardsvr" are set since those come from the command line.
     if (params->count("configsvr")) {
@@ -422,6 +436,10 @@ Status storeMongodOptions(const moe::Environment& params) {
         serverGlobalParams.cpu = params["cpu"].as<bool>();
     }
 
+    if (params.count("storage.indexBuildRetry")) {
+        serverGlobalParams.indexBuildRetry = params["storage.indexBuildRetry"].as<bool>();
+    }
+
     if (params.count("storage.journal.enabled")) {
         storageGlobalParams.dur = params["storage.journal.enabled"].as<bool>();
     }