summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl
diff options
context:
space:
mode:
authorJason Chan <jason.chan@mongodb.com>2021-08-17 23:08:47 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-08-18 19:51:21 +0000
commit8fdfe55ebd9bd4a9cd982e8eeb6052e6aedc4ccd (patch)
tree749045ffb7696c45d4fd928454827c8739487b4f /src/mongo/db/repl
parent7cb407c0a298cd015f720c51418ef9062c8c602e (diff)
downloadmongo-8fdfe55ebd9bd4a9cd982e8eeb6052e6aedc4ccd.tar.gz
SERVER-52936 Remove featureFlagTenantMigration
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r--src/mongo/db/repl/oplog.cpp5
-rw-r--r--src/mongo/db/repl/repl_server_parameters.idl7
2 files changed, 1 insertions, 11 deletions
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 89e6e1193bb..4d50cb7e241 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -343,13 +343,10 @@ void _logOpsInner(OperationContext* opCtx,
// across databases, but a tenant will never be able to rename into a database with a different
// prefix, so it is safe to use the fromCollection's db's prefix for this check.
//
- // We ignore FCV here when checking the feature flag since the FCV may not have been initialized
- // yet. This is safe since tenant migrations does not have any upgrade/downgrade behavior.
- //
// Skip the check if this is an "abortIndexBuild" oplog entry since it is safe to the abort an
// index build on the donor after the blockTimestamp, plus if an index build fails to commit due
// to TenantMigrationConflict, we need to be able to abort the index build and clean up.
- if (repl::feature_flags::gTenantMigrations.isEnabledAndIgnoreFCV() && !isAbortIndexBuild) {
+ if (!isAbortIndexBuild) {
tenant_migration_access_blocker::checkIfCanWriteOrThrow(opCtx, nss.db(), timestamps.back());
}
diff --git a/src/mongo/db/repl/repl_server_parameters.idl b/src/mongo/db/repl/repl_server_parameters.idl
index de92709ad49..e104bf67201 100644
--- a/src/mongo/db/repl/repl_server_parameters.idl
+++ b/src/mongo/db/repl/repl_server_parameters.idl
@@ -536,13 +536,6 @@ server_parameters:
default: "logical"
feature_flags:
- featureFlagTenantMigrations:
- description: >-
- When enabled, tenant migration commands are supported.
- cpp_varname: feature_flags::gTenantMigrations
- default: true
- version: 4.9
-
# TODO (SERVER-54730): Remove featureFlagUseSecondaryDelaySecs.
featureFlagUseSecondaryDelaySecs:
description: >-