don't split after a balance move fails (a lock taken would cause it) and defer splitting jumbos to SERVER-1358

1 files changed, 3 insertions, 7 deletions

diff --git a/s/balance.cpp b/s/balance.cpp
index db8cb9eb3b7..9d6391492fa 100644
--- a/s/balance.cpp
+++ b/s/balance.cpp
@@ -73,13 +73,9 @@ namespace mongo {
                 continue;
             }
 
-            log() << "MOVE FAILED **** " << res << "\n"
-                  << "           from: " << chunkInfo.from << " to: " << chunkInfo.to << " chunk: " << chunkToMove << endl;
-
-            if ( res["split"].trueValue() ) {
-                log() << "move asked for a split of " << c << endl;
-                c->singleSplit( true /* force a split even if not enough data */ );
-            }
+            // the move requires acquiring the collection metadata's lock, which can fail
+            log() << "balacer move failed: " << res << " from: " << chunkInfo.from << " to: " << chunkInfo.to 
+                  << " chunk: " << chunkToMove << endl;
         }
 
         return movedCount;