SERVER-13379 Do not mark Environment as valid before canonicalization is done in mongos

(cherry picked from commit 9265798fae9f784bff50755260c9536e15ceb7d7)

1 files changed, 7 insertions, 1 deletions

diff --git a/src/mongo/s/mongos_options_init.cpp b/src/mongo/s/mongos_options_init.cpp
index d4c91338c92..d1cb1f1872c 100644
--- a/src/mongo/s/mongos_options_init.cpp
+++ b/src/mongo/s/mongos_options_init.cpp
@@ -40,7 +40,9 @@ namespace mongo {
         if (!handlePreValidationMongosOptions(moe::startupOptionsParsed, context->args())) {
             ::_exit(EXIT_SUCCESS);
         }
-        Status ret = moe::startupOptionsParsed.validate();
+        // Run validation, but tell the Environment that we don't want it to be set as "valid",
+        // since we may be making it invalid in the canonicalization process.
+        Status ret = moe::startupOptionsParsed.validate(false/*setValid*/);
         if (!ret.isOK()) {
             return ret;
         }
@@ -52,6 +54,10 @@ namespace mongo {
         if (!ret.isOK()) {
             return ret;
         }
+        ret = moe::startupOptionsParsed.validate();
+        if (!ret.isOK()) {
+            return ret;
+        }
         return Status::OK();
     }