SERVER-21382 fixing sharding migration to transfer only document deletions relevant to the chunk being migrated, not every deletion

(cherry picked from commit 3663e004dfc2f73b82b3d88b5fa1ac6b7dcd1d33)

1 files changed, 6 insertions, 2 deletions

diff --git a/jstests/libs/chunk_manipulation_util.js b/jstests/libs/chunk_manipulation_util.js
index b1e4d5a90e1..8ad487667cf 100644
--- a/jstests/libs/chunk_manipulation_util.js
+++ b/jstests/libs/chunk_manipulation_util.js
@@ -201,7 +201,7 @@ function waitForMigrateStep( shardConnection, stepNumber ) {
         admin = shardConnection.getDB( 'admin' );
 
     assert( stepNumber >= 1);
-    assert( stepNumber <= 5 );
+    assert( stepNumber <= 5);
 
     var msg = (
         'Migrate thread on ' + shardConnection.shardName
@@ -215,7 +215,11 @@ function waitForMigrateStep( shardConnection, stepNumber ) {
         for ( var i = 0; i < in_progress.length; ++i ) {
             var op = in_progress[i];
             if ( op.desc && op.desc === 'migrateThread' ) {
-                return op.msg.startsWith( searchString );
+                if (op.hasOwnProperty('msg')) {
+                    return op.msg.startsWith( searchString );
+                } else {
+                    return false;
+                }
             }
         }