diff options
| author | Cheahuychou Mao <cheahuychou.mao@mongodb.com> | 2018-06-20 11:02:59 -0400 |
|---|---|---|
| committer | Cheahuychou Mao <cheahuychou.mao@mongodb.com> | 2018-06-22 16:31:47 -0400 |
| commit | cad96f75c950464eb7ad029976ed568998c6e0b3 (patch) | |
| tree | d960a9e2fb9db78c963d5fb649b801c4d25615c1 /jstests/sharding | |
| parent | a5e78c5cac31b22983cf4fc546329a85c0927fe9 (diff) | |
| download | mongo-cad96f75c950464eb7ad029976ed568998c6e0b3.tar.gz | |
SERVER-32884 Add back deleted sh.waitForBalancer() to utils_sh.js
Diffstat (limited to 'jstests/sharding')
| -rw-r--r-- | jstests/sharding/auto_rebalance_parallel.js | 4 | ||||
| -rw-r--r-- | jstests/sharding/auto_rebalance_parallel_replica_sets.js | 2 | ||||
| -rw-r--r-- | jstests/sharding/balancer_window.js | 4 | ||||
| -rw-r--r-- | jstests/sharding/enforce_zone_policy.js | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/jstests/sharding/auto_rebalance_parallel.js b/jstests/sharding/auto_rebalance_parallel.js index c27fef1fa31..bb86c1fb9f1 100644 --- a/jstests/sharding/auto_rebalance_parallel.js +++ b/jstests/sharding/auto_rebalance_parallel.js @@ -54,8 +54,8 @@ const testColl2InitialMoves = countMoves('TestDB.TestColl2'); st.startBalancer(); - st.awaitBalancerRound(); - st.awaitBalancerRound(); + st.waitForBalancer(true, 60000); + st.waitForBalancer(true, 60000); st.stopBalancer(); checkCollectionBalanced('TestDB.TestColl1'); diff --git a/jstests/sharding/auto_rebalance_parallel_replica_sets.js b/jstests/sharding/auto_rebalance_parallel_replica_sets.js index 965219c56ff..fdcd6457fe4 100644 --- a/jstests/sharding/auto_rebalance_parallel_replica_sets.js +++ b/jstests/sharding/auto_rebalance_parallel_replica_sets.js @@ -41,7 +41,7 @@ // Do enable the balancer and wait for a single balancer round st.startBalancer(); - st.awaitBalancerRound(); + st.waitForBalancer(true, 60000); st.stopBalancer(); assert.eq(1, diff --git a/jstests/sharding/balancer_window.js b/jstests/sharding/balancer_window.js index a60654b7d89..422085a537a 100644 --- a/jstests/sharding/balancer_window.js +++ b/jstests/sharding/balancer_window.js @@ -68,7 +68,7 @@ true)); st.startBalancer(); - st.awaitBalancerRound(); + st.waitForBalancer(true, 60000); var shard0ChunksAfter = configDB.chunks.find({ns: 'test.user', shard: st.shard0.shardName}).count(); @@ -84,7 +84,7 @@ }, true)); - st.awaitBalancerRound(); + st.waitForBalancer(true, 60000); shard0ChunksAfter = configDB.chunks.find({ns: 'test.user', shard: st.shard0.shardName}).count(); assert.neq(shard0Chunks, shard0ChunksAfter); diff --git a/jstests/sharding/enforce_zone_policy.js b/jstests/sharding/enforce_zone_policy.js index 7aac1aa02bf..4c57885ce10 100644 --- a/jstests/sharding/enforce_zone_policy.js +++ b/jstests/sharding/enforce_zone_policy.js @@ -34,7 +34,7 @@ assert.soon( checkFunc, 'Balance at step ' + stepName + ' did not happen', 3 * 60 * 1000, 2000); - st.awaitBalancerRound(); + st.waitForBalancer(true, 60000); st.printShardingStatus(true); assert(checkFunc()); |