SERVER-8836 remove2.js wait for deletion on migration until the resolution of SERVER-8598

1 files changed, 6 insertions, 0 deletions

diff --git a/jstests/sharding/remove2.js b/jstests/sharding/remove2.js
index daa5077431c..25c3f93d82a 100644
--- a/jstests/sharding/remove2.js
+++ b/jstests/sharding/remove2.js
@@ -81,6 +81,12 @@ var st = new ShardingTest( testName = "remove2",
                              rs1 : { nodes : 2 }
                            });
 
+// Pending resolution of SERVER-8598, we need to wait for deletion after chunk migrations to avoid
+// a pending delete re-creating a database after it was dropped.
+st.s.getDB("config").settings.update( { _id: "balancer" },
+                                      { $set : { _waitForDelete : true } },
+                                      true );
+
 var rst0 = st._rs[0].test;
 var rst1 = st._rs[1].test;