SERVER-71788 Defragmentation should handle ChunkTooBig errors

(cherry picked from commit 76d4cb7bd5b3654f7e3bba3aaf9fbb5c766476a4)

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mongo/db/s/balancer/balancer_defragmentation_policy_impl.cpp b/src/mongo/db/s/balancer/balancer_defragmentation_policy_impl.cpp
index b1521933098..a397731d6b2 100644
--- a/src/mongo/db/s/balancer/balancer_defragmentation_policy_impl.cpp
+++ b/src/mongo/db/s/balancer/balancer_defragmentation_policy_impl.cpp
@@ -521,6 +521,14 @@ public:
                     moveRequest.chunkToMove->busyInOperation = false;
                     moveRequest.chunkToMergeWith->busyInOperation = false;
 
+                    if (migrationResponse.code() == ErrorCodes::ChunkTooBig ||
+                        migrationResponse.code() == ErrorCodes::ExceededMemoryLimit) {
+                        // Never try moving this chunk again, it isn't actually small
+                        _removeIteratorFromSmallChunks(moveRequest.chunkToMove,
+                                                       moveRequest.chunkToMove->shard);
+                        return;
+                    }
+
                     if (isRetriableForDefragmentation(migrationResponse)) {
                         // The migration will be eventually retried
                         return;
@@ -711,7 +719,7 @@ private:
                                chunkToMove->range.getMin(),
                                chunkToMove->range.getMax(),
                                version,
-                               ForceJumbo::kForceBalancer,
+                               ForceJumbo::kDoNotForce,
                                maxChunkSizeBytes);
         }