Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scheduleres: label scheduler takes care of unhealthy regions. #1079

Merged
merged 2 commits into from
May 18, 2018
Merged

scheduleres: label scheduler takes care of unhealthy regions. #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
452e107
scheduleres: label scheduler takes care of unhealthy regions.
disksing May 18, 2018
6e97bb0
Merge branch 'master' into reject-leader2
Connor1996 May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions server/schedulers/label.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,17 @@ func (s *labelScheduler) Schedule(cluster schedule.Cluster, opInfluence schedule
}
log.Debugf("label scheduler reject leader store list: %v", rejectLeaderStores)
for id := range rejectLeaderStores {
if region := cluster.RandLeaderRegion(id, core.HealthRegion()); region != nil {
if region := cluster.RandLeaderRegion(id); region != nil {
log.Debugf("label scheduler selects region %d to transfer leader", region.GetId())
target := s.selector.SelectTarget(cluster, cluster.GetFollowerStores(region))
excludeStores := make(map[uint64]struct{})
for _, p := range region.DownPeers {
excludeStores[p.GetPeer().GetStoreId()] = struct{}{}
}
for _, p := range region.PendingPeers {
excludeStores[p.GetStoreId()] = struct{}{}
}
filter := schedule.NewExcludedFilter(nil, excludeStores)
target := s.selector.SelectTarget(cluster, cluster.GetFollowerStores(region), filter)
if target == nil {
log.Debugf("label scheduler no target found for region %d", region.GetId())
schedulerCounter.WithLabelValues(s.GetName(), "no_target").Inc()
Expand Down
19 changes: 16 additions & 3 deletions server/schedulers/scheduler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,28 @@ func (s *testRejectLeaderSuite) TestRejectLeader(c *C) {
op := sl.Schedule(tc, schedule.NewOpInfluence(nil, tc))
CheckTransferLeader(c, op[0], schedule.OpLeader, 1, 3)

// If store3 is disconnected, transfer leader to store 2 instead.
tc.SetStoreDisconnect(3)
// Transfer leader to store 2 instead.
op = sl.Schedule(tc, schedule.NewOpInfluence(nil, tc))
CheckTransferLeader(c, op[0], schedule.OpLeader, 1, 2)

// As store3 is disconnected, store1 rejects leader. Balancer will not create
// any operators.
sl, err = schedule.CreateScheduler("balance-leader", schedule.NewLimiter())
bs, err := schedule.CreateScheduler("balance-leader", schedule.NewLimiter())
c.Assert(err, IsNil)
op = sl.Schedule(tc, schedule.NewOpInfluence(nil, tc))
op = bs.Schedule(tc, schedule.NewOpInfluence(nil, tc))
c.Assert(op, IsNil)

// If the peer on store3 is pending, not trasnfer to store3 neither.
tc.SetStoreUp(3)
region := tc.Regions.GetRegion(1)
for _, p := range region.Peers {
if p.GetStoreId() == 3 {
region.PendingPeers = append(region.PendingPeers, p)
break
}
}
tc.Regions.AddRegion(region)
op = sl.Schedule(tc, schedule.NewOpInfluence(nil, tc))
CheckTransferLeader(c, op[0], schedule.OpLeader, 1, 2)
}