aboutsummaryrefslogtreecommitdiffstats
path: root/storage/src/tests
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahoo-inc.com>2017-11-16 12:51:22 +0000
committerTor Brede Vekterli <vekterli@yahoo-inc.com>2017-11-16 12:53:25 +0000
commitc21b6e1923b592c71bfcbb63261ab08f32438712 (patch)
treea48e82e8fbb2fd9761a555a8e0286a1d15342671 /storage/src/tests
parentcb33c571fcc8a5b27b8a29aef2c236b837121c19 (diff)
Flip internal priorities of GC and move-only merge
Having GC be higher priority than move-only merges meant that slow GC could effectively inhibit node retirement. Furthermore, move-only merges are finite while GC happens indefinitely, so it makes sense to give merging higher priority overall. This fixes #4165
Diffstat (limited to 'storage/src/tests')
-rw-r--r--storage/src/tests/distributor/statecheckerstest.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp
index e71525d5dd6..865d869761d 100644
--- a/storage/src/tests/distributor/statecheckerstest.cpp
+++ b/storage/src/tests/distributor/statecheckerstest.cpp
@@ -826,7 +826,7 @@ StateCheckersTest::testSynchronizeAndMove()
runAndVerify<SynchronizeAndMoveStateChecker>(
CheckerParams()
.expect("[Moving bucket to ideal node 3] "
- "(scheduling pri VERY_LOW)")
+ "(scheduling pri LOW)")
.bucketInfo("0=1,1=1,2=1")
.clusterState("distributor:1 storage:4")
.includeSchedulingPriority(true));
@@ -843,7 +843,7 @@ StateCheckersTest::testSynchronizeAndMove()
CheckerParams()
.expect("[Moving bucket to ideal node 1]"
"[Moving bucket to ideal node 3] (pri 165) "
- "(scheduling pri VERY_LOW)")
+ "(scheduling pri LOW)")
.clusterState("distributor:1 storage:5")
.bucketInfo("0=1,4=1,5=1")
.includeMessagePriority(true)
@@ -1540,7 +1540,7 @@ StateCheckersTest::testGarbageCollection()
void StateCheckersTest::gc_ops_are_prioritized_with_low_priority_category() {
CPPUNIT_ASSERT_EQUAL(
std::string("[Needs garbage collection: Last check at 3, current time 4000, "
- "configured interval 300] (scheduling pri LOW)"),
+ "configured interval 300] (scheduling pri VERY_LOW)"),
testGarbageCollection(3, 4000, 300, 1, false, true));
}