SERVER-66433 Backport deadline waiting for overlapping range deletion to finish to pre-v5.1 versions

1 files changed, 9 insertions, 0 deletions

diff --git a/src/mongo/db/s/migration_destination_manager.cpp b/src/mongo/db/s/migration_destination_manager.cpp
index 02243ac27f3..f4ce80806b9 100644
--- a/src/mongo/db/s/migration_destination_manager.cpp
+++ b/src/mongo/db/s/migration_destination_manager.cpp
@@ -962,6 +962,10 @@ void MigrationDestinationManager::_migrateDriver(OperationContext* outerOpCtx) {
     // 1. Ensure any data which might have been left orphaned in the range being moved has been
     // deleted.
     if (_useFCV44RangeDeleterProtocol) {
+        const auto rangeDeletionWaitDeadline =
+            outerOpCtx->getServiceContext()->getFastClockSource()->now() +
+            Milliseconds(receiveChunkWaitForRangeDeleterTimeoutMS.load());
+
         while (migrationutil::checkForConflictingDeletions(
             outerOpCtx, range, donorCollectionOptionsAndIndexes.uuid)) {
             uassert(ErrorCodes::ResumableRangeDeleterDisabled,
@@ -988,6 +992,11 @@ void MigrationDestinationManager::_migrateDriver(OperationContext* outerOpCtx) {
                 return;
             }
 
+            uassert(ErrorCodes::ExceededTimeLimit,
+                    "Exceeded deadline waiting for overlapping range deletion to finish",
+                    outerOpCtx->getServiceContext()->getFastClockSource()->now() <
+                        rangeDeletionWaitDeadline);
+
             // If the filtering metadata was cleared while the range deletion task was ongoing, then
             // 'waitForClean' would return immediately even though there really is an ongoing range
             // deletion task. For that case, we loop again until there is no conflicting task in