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

Jump to bottom

schedulers/hot: let leader can be schedule even if the peer is not balanced #2298

Merged
merged 4 commits into from
Mar 30, 2020
Merged

schedulers/hot: let leader can be schedule even if the peer is not balanced #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
18e3025
schedulers/hot: let leader can be schedule even if the peer is not ba…
nolouch Mar 28, 2020
2197de1
Merge branch 'master' into random-sche
nolouch Mar 28, 2020
6600732
address
nolouch Mar 28, 2020
e1a36cc
address comments
nolouch Mar 30, 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
39 changes: 15 additions & 24 deletions server/schedulers/hot_region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ const (
// HotWriteRegionType is hot write region scheduler type.
HotWriteRegionType = "hot-write-region"

hotRegionLimitFactor = 0.75
minHotScheduleInterval = time.Second
maxHotScheduleInterval = 20 * time.Second
)

// schedulePeerPr the probability of schedule the hot peer.
var schedulePeerPr = 0.66

type hotScheduler struct {
name string
*BaseScheduler
Expand Down Expand Up @@ -153,12 +155,12 @@ func (h *hotScheduler) IsScheduleAllowed(cluster opt.Cluster) bool {
}

func (h *hotScheduler) allowBalanceLeader(cluster opt.Cluster) bool {
return h.OpController.OperatorCount(operator.OpHotRegion) < minUint64(h.leaderLimit, cluster.GetHotRegionScheduleLimit()) &&
return h.OpController.OperatorCount(operator.OpHotRegion) < cluster.GetHotRegionScheduleLimit() &&
lhy1024 marked this conversation as resolved.
Show resolved Hide resolved
h.OpController.OperatorCount(operator.OpLeader) < cluster.GetLeaderScheduleLimit()
}

func (h *hotScheduler) allowBalanceRegion(cluster opt.Cluster) bool {
return h.OpController.OperatorCount(operator.OpHotRegion) < minUint64(h.peerLimit, cluster.GetHotRegionScheduleLimit())
return h.OpController.OperatorCount(operator.OpHotRegion) < cluster.GetHotRegionScheduleLimit()
}

func (h *hotScheduler) Schedule(cluster opt.Cluster) []*operator.Operator {
Expand Down Expand Up @@ -400,14 +402,19 @@ func (h *hotScheduler) balanceHotReadRegions(cluster opt.Cluster) []*operator.Op

func (h *hotScheduler) balanceHotWriteRegions(cluster opt.Cluster) []*operator.Operator {
// prefer to balance by peer
peerSolver := newBalanceSolver(h, cluster, write, movePeer)
ops := peerSolver.solve()
if len(ops) > 0 {
return ops
s := h.r.Intn(100)
switch {
case s < int(schedulePeerPr*100):
peerSolver := newBalanceSolver(h, cluster, write, movePeer)
ops := peerSolver.solve()
if len(ops) > 0 {
return ops
}
default:
}

leaderSolver := newBalanceSolver(h, cluster, write, transferLeader)
ops = leaderSolver.solve()
ops := leaderSolver.solve()
if len(ops) > 0 {
return ops
}
Expand Down Expand Up @@ -966,7 +973,6 @@ func (bs *balanceSolver) buildOperators() ([]*operator.Operator, []Influence) {
case movePeer:
srcPeer := bs.cur.region.GetStorePeer(bs.cur.srcStoreID) // checked in getRegionAndSrcPeer
dstPeer := &metapb.Peer{StoreId: bs.cur.dstStoreID, IsLearner: srcPeer.IsLearner}
bs.sche.peerLimit = bs.sche.adjustBalanceLimit(bs.cur.srcStoreID, bs.stLoadDetail)
op, err = operator.CreateMovePeerOperator(
"move-hot-"+bs.rwTy.String()+"-region",
bs.cluster,
Expand All @@ -981,7 +987,6 @@ func (bs *balanceSolver) buildOperators() ([]*operator.Operator, []Influence) {
if bs.cur.region.GetStoreVoter(bs.cur.dstStoreID) == nil {
return nil, nil
}
bs.sche.leaderLimit = bs.sche.adjustBalanceLimit(bs.cur.srcStoreID, bs.stLoadDetail)
op, err = operator.CreateTransferLeaderOperator(
"transfer-hot-"+bs.rwTy.String()+"-leader",
bs.cluster,
Expand Down Expand Up @@ -1013,20 +1018,6 @@ func (bs *balanceSolver) buildOperators() ([]*operator.Operator, []Influence) {
return []*operator.Operator{op}, []Influence{infl}
}

func (h *hotScheduler) adjustBalanceLimit(storeID uint64, loadDetail map[uint64]*storeLoadDetail) uint64 {
srcStoreStatistics := loadDetail[storeID]

var hotRegionTotalCount int
for _, m := range loadDetail {
hotRegionTotalCount += len(m.HotPeers)
}

avgRegionCount := float64(hotRegionTotalCount) / float64(len(loadDetail))
// Multiplied by hotRegionLimitFactor to avoid transfer back and forth
limit := uint64((float64(len(srcStoreStatistics.HotPeers)) - avgRegionCount) * hotRegionLimitFactor)
return maxUint64(limit, 1)
}

func (h *hotScheduler) GetHotReadStatus() *statistics.StoreHotPeersInfos {
h.RLock()
defer h.RUnlock()
Expand Down
4 changes: 4 additions & 0 deletions server/schedulers/hot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ import (
"github.com/pingcap/pd/v4/server/statistics"
)

func init() {
schedulePeerPr = 1.0
}

var _ = Suite(&testHotWriteRegionSchedulerSuite{})
var _ = Suite(&testHotSchedulerSuite{})

Expand Down