SERVER-9638 Handle case of previous moveChunk not finished yet

Depending on the speeds of operations in the shards, it is possible that
the "to" shard has not finished a migration when we try the next one.  Use
assert.soon() to wait a little and retry when this happens.

1 files changed, 14 insertions, 2 deletions

diff --git a/jstests/sharding/no_empty_reset.js b/jstests/sharding/no_empty_reset.js
index 62ef74cc6b0..91207147e90 100644
--- a/jstests/sharding/no_empty_reset.js
+++ b/jstests/sharding/no_empty_reset.js
@@ -29,7 +29,18 @@ var fullShard = st.getShard( coll, { _id : 1 } )
 var emptyShard = st.getShard( coll, { _id : -1 } )
 
 var admin = st.s.getDB( "admin" )
-printjson( admin.runCommand({ moveChunk : "" + coll, find : { _id : -1 }, to : fullShard.shardName, _waitForDelete : true }) )
+assert.soon(
+    function () {
+        var result = admin.runCommand( { moveChunk: "" + coll,
+                                         find: { _id: -1 },
+                                         to: fullShard.shardName,
+                                         _waitForDelete: true } );
+        jsTestLog('moveChunk result = ' + tojson(result));
+        return result.ok;
+    },
+    "Setup FAILURE:  Unable to move chunk from " + emptyShard.shardName +
+            " to " + fullShard.shardName
+);
 
 jsTestLog( "Resetting shard version via first mongos..." )
 
@@ -48,4 +59,5 @@ st.printShardingStatus()
 
 assert.eq( 0, emptyColl.find().itcount() )
 
-
+jsTestLog("DONE!");
+st.stop();