SERVER-24856 Make manual moveChunk requests go through the balancer on CSRS primary

1 files changed, 18 insertions, 23 deletions

diff --git a/jstests/slow1/sharding_multiple_collections.js b/jstests/slow1/sharding_multiple_collections.js
index 46ade14a0ad..b55cf0cde2d 100644
--- a/jstests/slow1/sharding_multiple_collections.js
+++ b/jstests/slow1/sharding_multiple_collections.js
@@ -1,23 +1,19 @@
 (function() {
+    'use strict';
 
-    var s = new ShardingTest({
-        name: "multcollections",
-        shards: 2,
-        mongos: 1,
-        verbose: 1,
-        other: {chunkSize: 1, enableBalancer: true}
-    });
+    var s = new ShardingTest({shards: 2, mongos: 1, other: {chunkSize: 1, enableBalancer: true}});
 
-    s.adminCommand({enablesharding: "test"});
-    db = s.getDB("test");
+    assert.commandWorked(s.s0.adminCommand({enablesharding: "test"}));
     s.ensurePrimaryShard('test', 'shard0001');
 
-    N = 100000;
-
-    S = "";
-    while (S.length < 500)
+    var S = "";
+    while (S.length < 500) {
         S += "123123312312";
+    }
+
+    var N = 100000;
 
+    var db = s.getDB("test");
     var bulk = db.foo.initializeUnorderedBulkOp();
     var bulk2 = db.bar.initializeUnorderedBulkOp();
     for (i = 0; i < N; i++) {
@@ -30,35 +26,34 @@
     s.printShardingStatus();
 
     function mytest(coll, i, loopNumber) {
-        x = coll.find({_id: i}).explain();
+        var x = coll.find({_id: i}).explain();
         if (x)
             return;
         throw Error("can't find " + i + " in " + coll.getName() + " on loopNumber: " + loopNumber +
                     " explain: " + tojson(x));
     }
 
-    loopNumber = 0;
-    while (1) {
-        for (i = 0; i < N; i++) {
+    for (var loopNumber = 0;; loopNumber++) {
+        for (var i = 0; i < N; i++) {
             mytest(db.foo, i, loopNumber);
             mytest(db.bar, i, loopNumber);
             if (i % 1000 == 0)
                 print(i);
         }
+
         s.printShardingStatus();
-        loopNumber++;
 
-        if (loopNumber == 1) {
-            s.adminCommand({shardcollection: "test.foo", key: {_id: 1}});
-            s.adminCommand({shardcollection: "test.bar", key: {_id: 1}});
+        if (loopNumber == 0) {
+            assert.commandWorked(s.s0.adminCommand({shardcollection: "test.foo", key: {_id: 1}}));
+            assert.commandWorked(s.s0.adminCommand({shardcollection: "test.bar", key: {_id: 1}}));
         }
 
         assert(loopNumber < 1000, "taking too long");
 
-        if (s.chunkDiff("foo") < 12 && s.chunkDiff("bar") < 12)
+        if (s.chunkDiff("foo") < 12 && s.chunkDiff("bar") < 12) {
             break;
+        }
     }
 
     s.stop();
-
 })();