diff options
author | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-08-31 12:06:53 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-08-31 15:22:15 +0000 |
commit | bd2827d46947646a538e256a4e656c8f94438917 (patch) | |
tree | dbaad465b045df560188cb94718b54d280dfe9ad /storage/src/tests/storageserver/mergethrottlertest.cpp | |
parent | 239ccaca10f97e9e4038ae48604e248e14074eb3 (diff) |
Wire together new listener to propagate errors
Diffstat (limited to 'storage/src/tests/storageserver/mergethrottlertest.cpp')
-rw-r--r-- | storage/src/tests/storageserver/mergethrottlertest.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/storage/src/tests/storageserver/mergethrottlertest.cpp b/storage/src/tests/storageserver/mergethrottlertest.cpp index 5e00ba373d2..29ff780807f 100644 --- a/storage/src/tests/storageserver/mergethrottlertest.cpp +++ b/storage/src/tests/storageserver/mergethrottlertest.cpp @@ -1577,7 +1577,10 @@ MergeThrottlerTest::testNewClusterStateAbortsAllOutdatedActiveMerges() void MergeThrottlerTest::backpressure_busy_bounces_merges_for_configured_duration() { _servers[0]->getClock().setAbsoluteTimeInSeconds(1000); - _throttlers[0]->applyTimedBackpressure(); + + CPPUNIT_ASSERT(!_throttlers[0]->backpressure_mode_active()); + _throttlers[0]->apply_timed_backpressure(); + CPPUNIT_ASSERT(_throttlers[0]->backpressure_mode_active()); document::BucketId bucket(16, 6789); CPPUNIT_ASSERT_EQUAL(uint64_t(0), _throttlers[0]->getMetrics().bounced_due_to_back_pressure.getValue()); @@ -1596,12 +1599,13 @@ void MergeThrottlerTest::backpressure_busy_bounces_merges_for_configured_duratio sendMerge(MergeBuilder(bucket).clusterStateVersion(10)); _topLinks[0]->waitForMessage(MessageType::MERGEBUCKET, _messageWaitTime); + CPPUNIT_ASSERT(!_throttlers[0]->backpressure_mode_active()); CPPUNIT_ASSERT_EQUAL(uint64_t(1), _throttlers[0]->getMetrics().bounced_due_to_back_pressure.getValue()); } void MergeThrottlerTest::source_only_merges_are_not_affected_by_backpressure() { _servers[2]->getClock().setAbsoluteTimeInSeconds(1000); - _throttlers[2]->applyTimedBackpressure(); + _throttlers[2]->apply_timed_backpressure(); document::BucketId bucket(16, 6789); _topLinks[2]->sendDown(MergeBuilder(bucket).clusterStateVersion(10).chain(0, 1).source_only(2).create()); |