From 79f64070f6510bade6a1d399a4c92ae7857f8852 Mon Sep 17 00:00:00 2001 From: jannaerin Date: Tue, 23 Aug 2022 15:33:38 +0000 Subject: SERVER-68899 Check FCV is initialized before checking that featureFlagRequireTenantId is enabled --- src/mongo/db/op_observer/op_observer_impl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mongo/db/op_observer') diff --git a/src/mongo/db/op_observer/op_observer_impl.cpp b/src/mongo/db/op_observer/op_observer_impl.cpp index 625f732bc53..cde9c5b8356 100644 --- a/src/mongo/db/op_observer/op_observer_impl.cpp +++ b/src/mongo/db/op_observer/op_observer_impl.cpp @@ -1362,9 +1362,9 @@ repl::OpTime OpObserverImpl::preRenameCollection(OperationContext* const opCtx, bool stayTemp, bool markFromMigrate) { BSONObjBuilder builder; - // TODO SERVER-62114 Change to check for upgraded FCV rather than feature flag - if (gFeatureFlagRequireTenantID.isEnabled(serverGlobalParams.featureCompatibility) || - !gMultitenancySupport) { + if (!gMultitenancySupport || + (serverGlobalParams.featureCompatibility.isVersionInitialized() && + gFeatureFlagRequireTenantID.isEnabled(serverGlobalParams.featureCompatibility))) { builder.append("renameCollection", fromCollection.ns()); builder.append("to", toCollection.ns()); } else { -- cgit v1.2.1