summaryrefslogtreecommitdiff
path: root/src/mongo/db/views
diff options
context:
space:
mode:
authorBlake Oler <blake.oler@mongodb.com>2018-06-21 14:55:01 -0400
committerBlake Oler <blake.oler@mongodb.com>2018-07-02 10:50:53 -0400
commit53a34c4f01d6b18df4c4800df9a72b1eff07fb6a (patch)
tree59dcf1abafee02e14dc8d1d51c43c0965bcaf29d /src/mongo/db/views
parentb3a542545c7367f96d57cab5e89dc389748c0e2c (diff)
downloadmongo-53a34c4f01d6b18df4c4800df9a72b1eff07fb6a.tar.gz
SERVER-35655 Update FCV constants throughout server code.
SERVER-35169 Bump wire protocol version for 4.2. SERVER-35752 Ensure tests that rely on FCV pass after updating FCV constants. SERVER-35163 Unblacklist tests that expect FCV version to differ between "last-stable" and "latest." SERVER-34984 Update major_version_upgrade.js to call setFCV to the latest FCV. SERVER-35656 Ensure a 4.0 mongos crashes upon attempting to connect to an FCV 4.2 cluster. SERVER-35404 Re-enable the sharding_last_stable_mongos_and_mixed_shards suite.
Diffstat (limited to 'src/mongo/db/views')
-rw-r--r--src/mongo/db/views/view_catalog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/views/view_catalog.cpp b/src/mongo/db/views/view_catalog.cpp
index 27eb95d875d..107249c3d3d 100644
--- a/src/mongo/db/views/view_catalog.cpp
+++ b/src/mongo/db/views/view_catalog.cpp
@@ -254,11 +254,11 @@ StatusWith<stdx::unordered_set<NamespaceString>> ViewCatalog::_validatePipeline_
// Save this to a variable to avoid reading the atomic variable multiple times.
auto currentFCV = serverGlobalParams.featureCompatibility.getVersion();
- // If the feature compatibility version is not 4.0, and we are validating features as master,
- // ban the use of new agg features introduced in 4.0 to prevent them from being persisted in the
+ // If the feature compatibility version is not 4.2, and we are validating features as master,
+ // ban the use of new agg features introduced in 4.2 to prevent them from being persisted in the
// catalog.
if (serverGlobalParams.validateFeaturesAsMaster.load() &&
- currentFCV != ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo40) {
+ currentFCV != ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo42) {
expCtx->maxFeatureCompatibilityVersion = currentFCV;
}
auto pipelineStatus = Pipeline::parse(viewDef.pipeline(), std::move(expCtx));