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

scheduler: add leader verify in balance-region scheduler (#2966) #2994

Merged
merged 8 commits into from
Sep 21, 2020
Merged

scheduler: add leader verify in balance-region scheduler (#2966) #2994

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b4a9e50
cherry pick #2966 to release-4.0
Yisaer Sep 18, 2020
bd76373
fix conflict
Yisaer Sep 21, 2020
e23b7bc
fix test
Yisaer Sep 21, 2020
9e33a84
Merge branch 'release-4.0' into release-4.0-4a95bcaabea3
ti-srebot Sep 21, 2020
12009f4
Merge branch 'release-4.0' into release-4.0-4a95bcaabea3
lhy1024 Sep 21, 2020
a3f7d90
Merge branch 'release-4.0' into release-4.0-4a95bcaabea3
ti-srebot Sep 21, 2020
00c883c
Merge branch 'release-4.0' into release-4.0-4a95bcaabea3
lhy1024 Sep 21, 2020
fb08a2d
Merge branch 'release-4.0' into release-4.0-4a95bcaabea3
ti-srebot Sep 21, 2020
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
8 changes: 6 additions & 2 deletions pkg/mock/mockcluster/mockcluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ func (mc *Cluster) RemoveScheduler(name string) error {
}

// MockRegionInfo returns a mock region
// If leaderStoreID is zero, the regions would have no leader
func (mc *Cluster) MockRegionInfo(regionID uint64, leaderStoreID uint64,
followerStoreIDs, learnerStoreIDs []uint64, epoch *metapb.RegionEpoch) *core.RegionInfo {

Expand All @@ -604,8 +605,11 @@ func (mc *Cluster) MockRegionInfo(regionID uint64, leaderStoreID uint64,
EndKey: []byte(fmt.Sprintf("%20d", regionID+1)),
RegionEpoch: epoch,
}
leader, _ := mc.AllocPeer(leaderStoreID)
region.Peers = []*metapb.Peer{leader}
var leader *metapb.Peer
if leaderStoreID != 0 {
leader, _ = mc.AllocPeer(leaderStoreID)
region.Peers = append(region.Peers, leader)
}
for _, storeID := range followerStoreIDs {
peer, _ := mc.AllocPeer(storeID)
region.Peers = append(region.Peers, peer)
Expand Down
7 changes: 2 additions & 5 deletions server/schedule/filter/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package filter
import (
"fmt"

"github.com/golang/protobuf/proto"
"github.com/pingcap/kvproto/pkg/metapb"
"github.com/pingcap/log"
"github.com/tikv/pd/pkg/slice"
Expand Down Expand Up @@ -722,11 +723,7 @@ var allSpeicalEngines = []string{EngineTiFlash}
// FitRegion in filter
func createRegionForRuleFit(startKey, endKey []byte,
peers []*metapb.Peer, leader *metapb.Peer, opts ...core.RegionCreateOption) *core.RegionInfo {
copyLeader := &metapb.Peer{
Id: leader.Id,
StoreId: leader.StoreId,
IsLearner: leader.IsLearner,
}
copyLeader := proto.Clone(leader).(*metapb.Peer)
copyPeers := make([]*metapb.Peer, 0, len(peers))
for _, p := range peers {
peer := &metapb.Peer{
Expand Down
6 changes: 6 additions & 0 deletions server/schedulers/balance_region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,12 @@ func (s *balanceRegionScheduler) Schedule(cluster opt.Cluster) []*operator.Opera
schedulerCounter.WithLabelValues(s.GetName(), "region-hot").Inc()
continue
}
// Check region whether have leader
if region.GetLeader() == nil {
log.Warn("region have no leader", zap.String("scheduler", s.GetName()), zap.Uint64("region-id", region.GetID()))
schedulerCounter.WithLabelValues(s.GetName(), "no-leader").Inc()
continue
}

oldPeer := region.GetStorePeer(sourceID)
if op := s.transferPeer(cluster, region, oldPeer); op != nil {
Expand Down
17 changes: 17 additions & 0 deletions server/schedulers/balance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,23 @@ func (s *testReplicaCheckerSuite) TestOpts(c *C) {
c.Assert(rc.Check(region), IsNil)
}

func (s *testBalanceRegionSchedulerSuite) TestShouldNotBalance(c *C) {
opt := config.NewTestOptions()
tc := mockcluster.NewCluster(opt)
tc.DisableFeature(versioninfo.JointConsensus)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not supported in release-4.0

Copy link
Contributor

@Yisaer Yisaer Sep 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch

oc := schedule.NewOperatorController(s.ctx, nil, nil)
sb, err := schedule.CreateScheduler(BalanceRegionType, oc, core.NewStorage(kv.NewMemoryKV()), schedule.ConfigSliceDecoder(BalanceRegionType, []string{"", ""}))
c.Assert(err, IsNil)
region := tc.MockRegionInfo(1, 0, []uint64{2, 3, 4}, nil, nil)
tc.PutRegion(region)
operators := sb.Schedule(tc)
if operators != nil {
c.Assert(len(operators), Equals, 0)
} else {
c.Assert(operators, IsNil)
}
}

var _ = Suite(&testRandomMergeSchedulerSuite{})

type testRandomMergeSchedulerSuite struct{}
Expand Down