Merge remote-tracking branch 'origin/master' into fix_tikv_11463

Signed-off-by: p4tr1ck <patricknicholas@foxmail.com>
tikv · Dec 13, 2021 · d6c55d2 · d6c55d2
2 parents e9f4179 + 5211ada
commit d6c55d2
Show file tree

Hide file tree

Showing 8 changed files with 362 additions and 327 deletions.
diff --git a/server/cluster/coordinator.go b/server/cluster/coordinator.go
@@ -466,7 +466,7 @@ func (c *coordinator) stop() {
 // TODO: remove it.
 type hasHotStatus interface {
 	GetHotStatus(statistics.RWType) *statistics.StoreHotPeersInfos
-	GetPendingInfluence() map[uint64]*schedulers.Influence
+	GetPendingInfluence() map[uint64]*statistics.Influence
 }
 
 func (c *coordinator) getHotWriteRegions() *statistics.StoreHotPeersInfos {

diff --git a/server/schedulers/grant_hot_region.go b/server/schedulers/grant_hot_region.go
@@ -159,7 +159,7 @@ type grantHotRegionScheduler struct {
 	conf        *grantHotRegionSchedulerConfig
 	handler     http.Handler
 	types       []statistics.RWType
-	stLoadInfos [resourceTypeLen]map[uint64]*storeLoadDetail
+	stLoadInfos [resourceTypeLen]map[uint64]*statistics.StoreLoadDetail
 }
 
 // newGrantHotRegionScheduler creates an admin scheduler that transfers hot region peer to fixed store and hot region leader to one store.
@@ -174,7 +174,7 @@ func newGrantHotRegionScheduler(opController *schedule.OperatorController, conf
 		types:         []statistics.RWType{statistics.Read, statistics.Write},
 	}
 	for ty := resourceType(0); ty < resourceTypeLen; ty++ {
-		ret.stLoadInfos[ty] = map[uint64]*storeLoadDetail{}
+		ret.stLoadInfos[ty] = map[uint64]*statistics.StoreLoadDetail{}
 	}
 	return ret
 }
@@ -274,11 +274,11 @@ func (s *grantHotRegionScheduler) Schedule(cluster opt.Cluster) []*operator.Oper
 }
 
 func (s *grantHotRegionScheduler) dispatch(typ statistics.RWType, cluster opt.Cluster) []*operator.Operator {
-	storeInfos := summaryStoreInfos(cluster)
+	storeInfos := statistics.SummaryStoreInfos(cluster)
 	storesLoads := cluster.GetStoresLoads()
 	isTraceRegionFlow := cluster.GetOpts().IsTraceRegionFlow()
 
-	var stLoadInfos map[uint64]*storeLoadDetail
+	var stLoadInfos map[uint64]*statistics.StoreLoadDetail
 	switch typ {
 	case statistics.Read:
 		stLoadInfos = summaryStoresLoad(
@@ -295,7 +295,7 @@ func (s *grantHotRegionScheduler) dispatch(typ statistics.RWType, cluster opt.Cl
 			isTraceRegionFlow,
 			statistics.Write, core.RegionKind)
 	}
-	infos := make([]*storeLoadDetail, len(stLoadInfos))
+	infos := make([]*statistics.StoreLoadDetail, len(stLoadInfos))
 	index := 0
 	for _, info := range stLoadInfos {
 		infos[index] = info
@@ -307,7 +307,7 @@ func (s *grantHotRegionScheduler) dispatch(typ statistics.RWType, cluster opt.Cl
 	return s.randomSchedule(cluster, infos)
 }
 
-func (s *grantHotRegionScheduler) randomSchedule(cluster opt.Cluster, infos []*storeLoadDetail) (ops []*operator.Operator) {
+func (s *grantHotRegionScheduler) randomSchedule(cluster opt.Cluster, infos []*statistics.StoreLoadDetail) (ops []*operator.Operator) {
 	isleader := s.r.Int()%2 == 1
 	for _, detail := range infos {
 		srcStoreID := detail.Info.Store.GetID()