summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/database_impl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/catalog/database_impl.cpp')
-rw-r--r--src/mongo/db/catalog/database_impl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/catalog/database_impl.cpp b/src/mongo/db/catalog/database_impl.cpp
index 0706f5a1479..c4c826566ee 100644
--- a/src/mongo/db/catalog/database_impl.cpp
+++ b/src/mongo/db/catalog/database_impl.cpp
@@ -772,7 +772,8 @@ Collection* DatabaseImpl::createCollection(OperationContext* opCtx,
auto coordinator = repl::ReplicationCoordinator::get(opCtx);
bool okayCreation =
(coordinator->getReplicationMode() != repl::ReplicationCoordinator::modeReplSet ||
- !serverGlobalParams.featureCompatibility.isFullyUpgradedTo36() ||
+ (serverGlobalParams.featureCompatibility.getVersion() !=
+ ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo36) ||
coordinator->canAcceptWritesForDatabase(opCtx, nss.db()) ||
nss.isSystemDotProfile()); // system.profile is special as it's not replicated
if (!okayCreation) {
@@ -1025,7 +1026,8 @@ auto mongo::userCreateNSImpl(OperationContext* opCtx,
MatchExpressionParser::AllowedFeatureSet allowedFeatures =
MatchExpressionParser::kBanAllSpecialFeatures;
if (!serverGlobalParams.validateFeaturesAsMaster.load() ||
- serverGlobalParams.featureCompatibility.isFullyUpgradedTo36()) {
+ (serverGlobalParams.featureCompatibility.getVersion() ==
+ ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo36)) {
// Note that we don't enforce this feature compatibility check when we are on
// the secondary or on a backup instance, as indicated by !validateFeaturesAsMaster.
allowedFeatures |= MatchExpressionParser::kJSONSchema;