Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 16 insertions, 10 deletions

diff --git a/jstests/sharding/balancer_window.js b/jstests/sharding/balancer_window.js
index ee48db64844..0e93d967363 100644
--- a/jstests/sharding/balancer_window.js
+++ b/jstests/sharding/balancer_window.js
@@ -45,17 +45,23 @@ var HourAndMinute = function(hour, minutes) {
     };
 };
 
-var st = new ShardingTest({shards: 2});
-var configDB = st.s.getDB('config');
-assert.commandWorked(configDB.adminCommand({enableSharding: 'test'}));
-assert.commandWorked(configDB.adminCommand({shardCollection: 'test.user', key: {_id: 1}}));
+const st = new ShardingTest({shards: 2, other: {chunkSize: 1, enableAutoSplit: false}});
+const dbName = 'test';
+const collName = 'user';
+const ns = dbName + '.' + collName;
+const configDB = st.s.getDB('config');
+assert.commandWorked(configDB.adminCommand({enableSharding: dbName}));
+assert.commandWorked(configDB.adminCommand({shardCollection: ns, key: {_id: 1}}));
 
+const bigString = 'X'.repeat(1024 * 1024);  // 1MB
+const coll = st.s.getDB(dbName).getCollection(collName);
 for (var x = 0; x < 150; x += 10) {
-    configDB.adminCommand({split: 'test.user', middle: {_id: x}});
+    coll.insert({_id: x, s: bigString});
+    configDB.adminCommand({split: ns, middle: {_id: x}});
 }
 
 var shard0Chunks =
-    findChunksUtil.findChunksByNs(configDB, 'test.user', {shard: st.shard0.shardName}).count();
+    findChunksUtil.findChunksByNs(configDB, ns, {shard: st.shard0.shardName}).count();
 
 var startDate = new Date();
 var hourMinStart = new HourAndMinute(startDate.getHours(), startDate.getMinutes());
@@ -72,10 +78,10 @@ assert.commandWorked(
                              true));
 st.startBalancer();
 
-st.waitForBalancer(true, 60000);
+st.awaitBalancerRound();
 
 var shard0ChunksAfter =
-    findChunksUtil.findChunksByNs(configDB, 'test.user', {shard: st.shard0.shardName}).count();
+    findChunksUtil.findChunksByNs(configDB, ns, {shard: st.shard0.shardName}).count();
 assert.eq(shard0Chunks, shard0ChunksAfter);
 
 assert.commandWorked(configDB.settings.update(
@@ -87,10 +93,10 @@ assert.commandWorked(configDB.settings.update(
     },
     true));
 
-st.waitForBalancer(true, 60000);
+st.awaitBalancerRound();
 
 shard0ChunksAfter =
-    findChunksUtil.findChunksByNs(configDB, 'test.user', {shard: st.shard0.shardName}).count();
+    findChunksUtil.findChunksByNs(configDB, ns, {shard: st.shard0.shardName}).count();
 assert.neq(shard0Chunks, shard0ChunksAfter);
 
 st.stop();