From 212de074636177a1bcaab42080aa3b8affc91c63 Mon Sep 17 00:00:00 2001 From: nolouch Date: Wed, 3 Jul 2019 19:48:43 +0800 Subject: [PATCH 1/2] config: turn the default limit of the hot region schedule Signed-off-by: nolouch --- conf/config.toml | 1 + pkg/mock/mockoption/mockoption.go | 10 +++++----- server/config.go | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/conf/config.toml b/conf/config.toml index 3b3289eb61c..ae2b4122cf4 100644 --- a/conf/config.toml +++ b/conf/config.toml @@ -67,6 +67,7 @@ leader-schedule-limit = 4 region-schedule-limit = 64 replica-schedule-limit = 64 merge-schedule-limit = 8 +hot-region-schedule-limit = 4 #tolerant-size-ratio = 0.0 #enable-one-way-merge = false diff --git a/pkg/mock/mockoption/mockoption.go b/pkg/mock/mockoption/mockoption.go index cd55f712ade..8c0fe2a4f3f 100644 --- a/pkg/mock/mockoption/mockoption.go +++ b/pkg/mock/mockoption/mockoption.go @@ -27,13 +27,13 @@ const ( defaultMaxMergeRegionKeys = 0 defaultSplitMergeInterval = 0 defaultMaxStoreDownTime = 30 * time.Minute - defaultLeaderScheduleLimit = 4 - defaultRegionScheduleLimit = 4 - defaultReplicaScheduleLimit = 8 + defaultLeaderScheduleLimit = 8 + defaultRegionScheduleLimit = 64 + defaultReplicaScheduleLimit = 64 defaultMergeScheduleLimit = 8 - defaultHotRegionScheduleLimit = 2 + defaultHotRegionScheduleLimit = 4 defaultStoreBalanceRate = 60 - defaultTolerantSizeRatio = 2.5 + defaultTolerantSizeRatio = 0 defaultLowSpaceRatio = 0.8 defaultHighSpaceRatio = 0.6 defaultSchedulerMaxWaitingOperator = 3 diff --git a/server/config.go b/server/config.go index 3eb800042e8..f0f32cbbd2f 100644 --- a/server/config.go +++ b/server/config.go @@ -580,7 +580,7 @@ const ( defaultRegionScheduleLimit = 64 defaultReplicaScheduleLimit = 64 defaultMergeScheduleLimit = 8 - defaultHotRegionScheduleLimit = 2 + defaultHotRegionScheduleLimit = 4 defaultStoreBalanceRate = 15 defaultTolerantSizeRatio = 0 defaultLowSpaceRatio = 0.8 From d339ee87bf63c843b6b8e02fd4afc19ceed321b3 Mon Sep 17 00:00:00 2001 From: nolouch Date: Wed, 3 Jul 2019 19:58:52 +0800 Subject: [PATCH 2/2] try to fix ci Signed-off-by: nolouch --- pkg/mock/mockoption/mockoption.go | 4 ++-- server/config.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/mock/mockoption/mockoption.go b/pkg/mock/mockoption/mockoption.go index 8c0fe2a4f3f..df2baf560dd 100644 --- a/pkg/mock/mockoption/mockoption.go +++ b/pkg/mock/mockoption/mockoption.go @@ -27,13 +27,13 @@ const ( defaultMaxMergeRegionKeys = 0 defaultSplitMergeInterval = 0 defaultMaxStoreDownTime = 30 * time.Minute - defaultLeaderScheduleLimit = 8 + defaultLeaderScheduleLimit = 4 defaultRegionScheduleLimit = 64 defaultReplicaScheduleLimit = 64 defaultMergeScheduleLimit = 8 defaultHotRegionScheduleLimit = 4 defaultStoreBalanceRate = 60 - defaultTolerantSizeRatio = 0 + defaultTolerantSizeRatio = 2.5 defaultLowSpaceRatio = 0.8 defaultHighSpaceRatio = 0.6 defaultSchedulerMaxWaitingOperator = 3 diff --git a/server/config.go b/server/config.go index f0f32cbbd2f..5e53c43f7b3 100644 --- a/server/config.go +++ b/server/config.go @@ -576,7 +576,7 @@ const ( defaultSplitMergeInterval = 1 * time.Hour defaultPatrolRegionInterval = 100 * time.Millisecond defaultMaxStoreDownTime = 30 * time.Minute - defaultLeaderScheduleLimit = 8 + defaultLeaderScheduleLimit = 4 defaultRegionScheduleLimit = 64 defaultReplicaScheduleLimit = 64 defaultMergeScheduleLimit = 8