fix target

Signed-off-by: Song Gao <[email protected]>
tikv · Mar 16, 2021 · 510712c · 510712c
1 parent 92ddb62
commit 510712c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/server/schedulers/hot_region.go b/server/schedulers/hot_region.go
@@ -732,7 +732,6 @@ func (bs *balanceSolver) filterDstStores() map[uint64]*storeLoadDetail {
 	if srcStore == nil {
 		return nil
 	}
-
 	switch bs.opTy {
 	case movePeer:
 		filters = []filter.Filter{
@@ -742,7 +741,9 @@ func (bs *balanceSolver) filterDstStores() map[uint64]*storeLoadDetail {
 			filter.NewPlacementSafeguard(bs.sche.GetName(), bs.cluster, bs.cur.region, srcStore),
 		}
 
-		candidates = bs.cluster.GetStores()
+		for storeID := range bs.stLoadDetail {
+			candidates = append(candidates, bs.cluster.GetStore(storeID))
+		}
 
 	case transferLeader:
 		filters = []filter.Filter{
@@ -753,7 +754,15 @@ func (bs *balanceSolver) filterDstStores() map[uint64]*storeLoadDetail {
 			filters = append(filters, leaderFilter)
 		}
 
-		candidates = bs.cluster.GetFollowerStores(bs.cur.region)
+		regionStores := make(map[uint64]*core.StoreInfo, 0)
+		for _, store := range bs.cluster.GetFollowerStores(bs.cur.region) {
+			regionStores[store.GetID()] = store
+		}
+		for storeID := range bs.stLoadDetail {
+			if store, ok := regionStores[storeID]; ok {
+				candidates = append(candidates, store)
+			}
+		}
 
 	default:
 		return nil