Skip to content

Commit

Permalink
schedulers: evict-leader supports schedule the regions with unhealthy…
Browse files Browse the repository at this point in the history
… peers (#4096) (#4130)

close #4093

Signed-off-by: HunDunDM <hundundm@gmail.com>

Co-authored-by: HunDunDM <hundundm@gmail.com>
  • Loading branch information
ti-chi-bot and HunDunDM authored Dec 3, 2021
1 parent b940d5d commit 7161fde
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 4 deletions.
22 changes: 18 additions & 4 deletions server/schedulers/evict_leader.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,29 @@ func (s *evictLeaderScheduler) IsScheduleAllowed(cluster opt.Cluster) bool {
func (s *evictLeaderScheduler) scheduleOnce(cluster opt.Cluster) []*operator.Operator {
var ops []*operator.Operator
for id, ranges := range s.conf.StoreIDWithRanges {
var filters []filter.Filter
region := cluster.RandLeaderRegion(id, ranges, opt.HealthRegion(cluster))
if region == nil {
schedulerCounter.WithLabelValues(s.GetName(), "no-leader").Inc()
continue
// try to pick unhealthy region
region = cluster.RandLeaderRegion(id, ranges)
if region == nil {
schedulerCounter.WithLabelValues(s.GetName(), "no-leader").Inc()
continue
}
schedulerCounter.WithLabelValues(s.GetName(), "pick-unhealthy-region").Inc()
unhealthyPeerStores := make(map[uint64]struct{})
for _, peer := range region.GetDownPeers() {
unhealthyPeerStores[peer.GetPeer().GetStoreId()] = struct{}{}
}
for _, peer := range region.GetPendingPeers() {
unhealthyPeerStores[peer.GetStoreId()] = struct{}{}
}
filters = append(filters, filter.NewExcludedFilter(EvictLeaderName, nil, unhealthyPeerStores))
}

filters = append(filters, &filter.StoreStateFilter{ActionScope: EvictLeaderName, TransferLeader: true})
target := filter.NewCandidates(cluster.GetFollowerStores(region)).
FilterTarget(cluster.GetOpts(), &filter.StoreStateFilter{ActionScope: EvictLeaderName, TransferLeader: true}).
RandomPick()
FilterTarget(cluster.GetOpts(), filters...).RandomPick()
if target == nil {
schedulerCounter.WithLabelValues(s.GetName(), "no-target-store").Inc()
continue
Expand Down
35 changes: 35 additions & 0 deletions server/schedulers/scheduler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (

. "github.com/pingcap/check"
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/pingcap/kvproto/pkg/pdpb"
"github.com/tikv/pd/pkg/mock/mockcluster"
"github.com/tikv/pd/pkg/testutil"
"github.com/tikv/pd/server/config"
Expand Down Expand Up @@ -266,6 +267,40 @@ func (s *testEvictLeaderSuite) TestEvictLeader(c *C) {
testutil.CheckTransferLeader(c, op[0], operator.OpLeader, 1, 2)
}

func (s *testEvictLeaderSuite) TestEvictLeaderWithUnhealthyPeer(c *C) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
opt := config.NewTestOptions()
tc := mockcluster.NewCluster(opt)
sl, err := schedule.CreateScheduler(EvictLeaderType, schedule.NewOperatorController(ctx, nil, nil), core.NewStorage(kv.NewMemoryKV()), schedule.ConfigSliceDecoder(EvictLeaderType, []string{"1"}))
c.Assert(err, IsNil)

// Add stores 1, 2, 3
tc.AddLeaderStore(1, 0)
tc.AddLeaderStore(2, 0)
tc.AddLeaderStore(3, 0)
// Add region 1, which has 3 peers. 1 is leader. 2 is healthy or pending, 3 is healthy or down.
tc.AddLeaderRegion(1, 1, 2, 3)
region := tc.MockRegionInfo(1, 1, []uint64{2, 3}, nil, nil)
withDownPeer := core.WithDownPeers([]*pdpb.PeerStats{{
Peer: region.GetPeers()[2],
DownSeconds: 1000,
}})
withPendingPeer := core.WithPendingPeers([]*metapb.Peer{region.GetPeers()[1]})

// only pending
tc.PutRegion(region.Clone(withPendingPeer))
op := sl.Schedule(tc)
testutil.CheckTransferLeader(c, op[0], operator.OpLeader, 1, 3)
// only down
tc.PutRegion(region.Clone(withDownPeer))
op = sl.Schedule(tc)
testutil.CheckTransferLeader(c, op[0], operator.OpLeader, 1, 2)
// pending + down
tc.PutRegion(region.Clone(withPendingPeer, withDownPeer))
c.Assert(sl.Schedule(tc), HasLen, 0)
}

var _ = Suite(&testShuffleRegionSuite{})

type testShuffleRegionSuite struct{}
Expand Down

0 comments on commit 7161fde

Please sign in to comment.