resolve conflicts

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Dec 13, 2021 · e73e323 · e73e323
1 parent 73ae0be
commit e73e323
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/cluster/coordinator.go b/server/cluster/coordinator.go
@@ -535,7 +535,7 @@ func (c *coordinator) collectHotSpotMetrics() {
 	collectPendingInfluence(stores)
 }
 
-func collectHotMetrics(stores []*core.StoreInfo, storesLoads map[uint64][]float64, regionStats map[uint64][]*statistics.HotPeerStat, typ string, isTraceRegionFlow bool) {
+func collectHotMetrics(stores []*core.StoreInfo, storesLoads map[uint64][]float64, regionStats map[uint64][]*statistics.HotPeerStat, typ statistics.RWType, isTraceRegionFlow bool) {
 	status := statistics.GetHotStatus(stores, storesLoads, regionStats, typ, isTraceRegionFlow)
 	var (
 		kind                      string