diff options
| author | Tor Brede Vekterli <vekterli@oath.com> | 2017-11-16 14:25:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 14:25:42 +0100 |
| commit | 0d7e5a2789af46e7744bf9b0ddc18d5a97d1bb3b (patch) | |
| tree | ecbf2b9a92615bfd826ae94a3405c7d66be9a79c /storage | |
| parent | 61aef5f9d1a2441fe6d0e716782b14f60f87daa9 (diff) | |
| parent | c21b6e1923b592c71bfcbb63261ab08f32438712 (diff) | |
Merge pull request #4168 from vespa-engine/vekterli/flip-internal-priorities-of-gc-and-move-only-merge
Flip internal priorities of GC and move-only merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/tests/distributor/statecheckerstest.cpp | 6 | ||||
| -rw-r--r-- | storage/src/vespa/storage/distributor/statecheckers.cpp | 4 |
2 files changed, 5 insertions, 5 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)); } diff --git a/storage/src/vespa/storage/distributor/statecheckers.cpp b/storage/src/vespa/storage/distributor/statecheckers.cpp index 49e9ba9f1c4..1f0cb19ef93 100644 --- a/storage/src/vespa/storage/distributor/statecheckers.cpp +++ b/storage/src/vespa/storage/distributor/statecheckers.cpp @@ -849,7 +849,7 @@ SynchronizeAndMoveStateChecker::check(StateChecker::Context& c) op->setPriority(result.priority()); op->setDetailedReason(result.reason()); MaintenancePriority::Priority schedPri( - result.needsMoveOnly() ? MaintenancePriority::VERY_LOW + result.needsMoveOnly() ? MaintenancePriority::LOW : MaintenancePriority::MEDIUM); return Result::createStoredResult(std::move(op), schedPri); @@ -1142,7 +1142,7 @@ GarbageCollectionStateChecker::check(Context& c) op->setPriority(c.distributorConfig.getMaintenancePriorities() .garbageCollection); op->setDetailedReason(reason.c_str()); - return Result::createStoredResult(std::move(op), MaintenancePriority::LOW); + return Result::createStoredResult(std::move(op), MaintenancePriority::VERY_LOW); } else { return Result::noMaintenanceNeeded(); } |