From e4fc8b73d3a943cbc9071320876ea1f58f151bb5 Mon Sep 17 00:00:00 2001 From: Alex Taskov Date: Thu, 30 Jan 2020 21:22:36 +0000 Subject: SERVER-45743 Add a flag to allow opting out of using the Resumable RangeDeleter --- src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp') diff --git a/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp b/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp index 5ba3a2068e7..b9dd891ed17 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp @@ -44,6 +44,7 @@ #include "mongo/db/repl/replication_process.h" #include "mongo/db/s/collection_sharding_runtime.h" #include "mongo/db/s/migration_source_manager.h" +#include "mongo/db/s/sharding_runtime_d_params_gen.h" #include "mongo/db/s/sharding_statistics.h" #include "mongo/db/s/start_chunk_clone_request.h" #include "mongo/db/service_context.h" @@ -279,7 +280,8 @@ Status MigrationChunkClonerSourceLegacy::startClone(OperationContext* opCtx, BSONObjBuilder cmdBuilder; auto fcvVersion = serverGlobalParams.featureCompatibility.getVersion(); - if (fcvVersion == ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo44) { + if (fcvVersion == ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo44 && + !disableResumableRangeDeleter.load()) { StartChunkCloneRequest::appendAsCommand(&cmdBuilder, _args.getNss(), migrationId, @@ -292,7 +294,8 @@ Status MigrationChunkClonerSourceLegacy::startClone(OperationContext* opCtx, _shardKeyPattern.toBSON(), _args.getSecondaryThrottle()); } else { - // TODO (SERVER-44787): Remove this overload after 4.4 is released. + // TODO (SERVER-44787): Remove this overload after 4.4 is released AND + // disableResumableRangeDeleter has been removed from server parameters. StartChunkCloneRequest::appendAsCommand(&cmdBuilder, _args.getNss(), _sessionId, -- cgit v1.2.1