diff options
| -rw-r--r-- | jstests/sharding/balancer_window.js | 41 | ||||
| -rw-r--r-- | src/mongo/s/balancer/balancer.cpp | 6 |
2 files changed, 17 insertions, 30 deletions
diff --git a/jstests/sharding/balancer_window.js b/jstests/sharding/balancer_window.js index 9f100846f1e..247b7e2bafa 100644 --- a/jstests/sharding/balancer_window.js +++ b/jstests/sharding/balancer_window.js @@ -11,6 +11,8 @@ * sure that some chunks are moved. */ (function() { + 'use strict'; + /** * Simple representation for wall clock time. Hour and minutes should be integers. */ @@ -82,17 +84,8 @@ var st = new ShardingTest({shards: 2}); var configDB = st.s.getDB('config'); - assert.commandWorked(configDB.adminCommand({ - configureFailPoint: 'balancerRoundIntervalSetting', - mode: 'alwaysOn', - data: {sleepSecs: 1} - })); - - configDB.adminCommand({enableSharding: 'test'}); - configDB.adminCommand({shardCollection: 'test.user', key: {_id: 1}}); - - // Disable balancer so it will not interfere with the chunk distribution setup. - st.stopBalancer(); + assert.commandWorked(configDB.adminCommand({enableSharding: 'test'})); + assert.commandWorked(configDB.adminCommand({shardCollection: 'test.user', key: {_id: 1}})); for (var x = 0; x < 150; x += 10) { configDB.adminCommand({split: 'test.user', middle: {_id: x}}); @@ -102,24 +95,24 @@ var startDate = new Date(); var hourMinStart = new HourAndMinute(startDate.getHours(), startDate.getMinutes()); - configDB.settings.update({_id: 'balancer'}, - { - $set: { - activeWindow: { - start: hourMinStart.addHour(-2).toString(), - stop: hourMinStart.addHour(-1).toString() - }, - stopped: false - } - }, - true); + assert.writeOK(configDB.settings.update({_id: 'balancer'}, + { + $set: { + activeWindow: { + start: hourMinStart.addHour(-2).toString(), + stop: hourMinStart.addHour(-1).toString() + }, + stopped: false, + } + }, + true)); waitForAtLeastOneBalanceRound(st.s.host, 60 * 1000); var shard0ChunksAfter = configDB.chunks.find({ns: 'test.user', shard: 'shard0000'}).count(); assert.eq(shard0Chunks, shard0ChunksAfter); - configDB.settings.update( + assert.writeOK(configDB.settings.update( {_id: 'balancer'}, { $set: { @@ -127,7 +120,7 @@ {start: hourMinStart.toString(), stop: hourMinStart.addHour(2).toString()} } }, - true); + true)); waitForAtLeastOneBalanceRound(st.s.host, 60 * 1000); diff --git a/src/mongo/s/balancer/balancer.cpp b/src/mongo/s/balancer/balancer.cpp index 0b8a93f8fe9..d4d463ace64 100644 --- a/src/mongo/s/balancer/balancer.cpp +++ b/src/mongo/s/balancer/balancer.cpp @@ -242,7 +242,6 @@ Status executeSingleMigration(OperationContext* txn, } MONGO_FP_DECLARE(skipBalanceRound); -MONGO_FP_DECLARE(balancerRoundIntervalSetting); } // namespace @@ -337,11 +336,6 @@ void Balancer::_mainThread() { // know that there is an active balancer _stardingUptimeReporter.reportStatus(txn.get(), true); - MONGO_FAIL_POINT_BLOCK(balancerRoundIntervalSetting, scopedBalancerRoundInterval) { - const BSONObj& data = scopedBalancerRoundInterval.getData(); - balanceRoundInterval = Seconds(data["sleepSecs"].numberInt()); - } - // Use fresh shard state and balancer settings shardingContext->shardRegistry()->reload(txn.get()); |