SERVER-53973 Migration manager recovery should handle failed findIntersectingChunk during refineShardKey

1 files changed, 13 insertions, 6 deletions

diff --git a/src/mongo/db/s/balancer/migration_manager.cpp b/src/mongo/db/s/balancer/migration_manager.cpp
index 44df685b310..08f6641ea7b 100644
--- a/src/mongo/db/s/balancer/migration_manager.cpp
+++ b/src/mongo/db/s/balancer/migration_manager.cpp
@@ -360,12 +360,19 @@ void MigrationManager::finishRecovery(OperationContext* opCtx,
             auto waitForDelete = migrationType.getWaitForDelete();
             migrateInfos.pop_front();
 
-            const auto chunk =
-                routingInfo.cm()->findIntersectingChunkWithSimpleCollation(migrationInfo.minKey);
-
-            if (chunk.getShardId() != migrationInfo.from) {
-                // Chunk is no longer on the source shard specified by this migration. Erase the
-                // migration recovery document associated with it.
+            try {
+                const auto chunk = routingInfo.cm()->findIntersectingChunkWithSimpleCollation(
+                    migrationInfo.minKey);
+
+                if (chunk.getShardId() != migrationInfo.from) {
+                    // Chunk is no longer on the source shard specified by this migration. Erase the
+                    // migration recovery document associated with it.
+                    ScopedMigrationRequest::createForRecovery(opCtx, nss, migrationInfo.minKey);
+                    continue;
+                }
+            } catch (const ExceptionFor<ErrorCodes::ShardKeyNotFound>&) {
+                // The shard key for the collection has changed.
+                // Abandon this migration and remove the document associated with it.
                 ScopedMigrationRequest::createForRecovery(opCtx, nss, migrationInfo.minKey);
                 continue;
             }