summaryrefslogtreecommitdiff
path: root/src/mongo/s/server.cpp
diff options
context:
space:
mode:
authorMaria van Keulen <maria@mongodb.com>2018-02-08 18:15:57 -0500
committerMaria van Keulen <maria@mongodb.com>2018-02-21 10:28:45 -0500
commit6df7ca5841e2ffa40354975323e410796d952382 (patch)
treeec090fec1d80dc979b4e8439a848d932c4a5b4e9 /src/mongo/s/server.cpp
parenta3f077342401e97df986c66792eb099978301631 (diff)
downloadmongo-6df7ca5841e2ffa40354975323e410796d952382.tar.gz
SERVER-32597 Bump generic fCV references
Diffstat (limited to 'src/mongo/s/server.cpp')
-rw-r--r--src/mongo/s/server.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index d4673afd1cc..c03b7a920df 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -524,12 +524,15 @@ MONGO_INITIALIZER_GENERAL(ForkServer, ("EndStartupOptionHandling"), ("default"))
return Status::OK();
}
-// We set the featureCompatibilityVersion to 3.6 in the mongos and rely on the shards to reject
-// usages of new features if their featureCompatibilityVersion is lower.
-MONGO_INITIALIZER_WITH_PREREQUISITES(SetFeatureCompatibilityVersion36, ("EndStartupOptionStorage"))
+// Initialize the featureCompatibilityVersion server parameter since mongos does not have a
+// featureCompatibilityVersion document from which to initialize the parameter. The parameter is set
+// to the latest version because there is no feature gating that currently occurs at the mongos
+// level. The shards are responsible for rejecting usages of new features if their
+// featureCompatibilityVersion is lower.
+MONGO_INITIALIZER_WITH_PREREQUISITES(SetFeatureCompatibilityVersion40, ("EndStartupOptionStorage"))
(InitializerContext* context) {
serverGlobalParams.featureCompatibility.setVersion(
- ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo36);
+ ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo40);
return Status::OK();
}