diff options
| author | jannaerin <golden.janna@gmail.com> | 2022-08-23 15:33:38 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-23 16:43:52 +0000 |
| commit | 79f64070f6510bade6a1d399a4c92ae7857f8852 (patch) | |
| tree | c696418143773cf9ee2a7abe4bbe563906813f03 /src/mongo/db/op_observer | |
| parent | 64294b4279408d076884bf3459d289ff80856283 (diff) | |
| download | mongo-79f64070f6510bade6a1d399a4c92ae7857f8852.tar.gz | |
SERVER-68899 Check FCV is initialized before checking that featureFlagRequireTenantId is enabled
Diffstat (limited to 'src/mongo/db/op_observer')
| -rw-r--r-- | src/mongo/db/op_observer/op_observer_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 { |