Skip to content

schedulers: let hot region balance not affect by balance-region-scheduler-limit #1522

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

Merged
disksing merged 4 commits into from
May 8, 2019
Merged

schedulers: let hot region balance not affect by balance-region-scheduler-limit #1522

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c9b9a6
schedulers: let hot region balance not affect by
nolouch Apr 28, 2019
e41909a
Merge branch 'master' into hot-limit
nolouch Apr 28, 2019
91f12d5
Merge branch 'master' into hot-limit
nolouch May 6, 2019
6224e92
address comments
nolouch May 8, 2019
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
Prev Previous commit
address comments
  • Loading branch information
@nolouch
nolouch committed May 8, 2019
commit 6224e92852c5aa980e9de65595d070b98dbb6e4f
9 changes: 4 additions & 5 deletions server/schedulers/hot_region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ func (h *balanceHotRegionsScheduler) balanceByPeer(cluster schedule.Cluster, sto

destStoreID = h.selectDestStore(candidateStoreIDs, rs.FlowBytes, srcStoreID, storesStat)
if destStoreID != 0 {
h.adjustBalanceLimit(srcStoreID, storesStat, func(limit uint64) { h.peerLimit = limit })
h.peerLimit = h.adjustBalanceLimit(srcStoreID, storesStat)

srcPeer := srcRegion.GetStorePeer(srcStoreID)
if srcPeer == nil {
Expand Down Expand Up @@ -374,7 +374,7 @@ func (h *balanceHotRegionsScheduler) balanceByLeader(cluster schedule.Cluster, s

destPeer := srcRegion.GetStoreVoter(destStoreID)
if destPeer != nil {
h.adjustBalanceLimit(srcStoreID, storesStat, func(limit uint64) { h.leaderLimit = limit })
h.leaderLimit = h.adjustBalanceLimit(srcStoreID, storesStat)

return srcRegion, destPeer
}
Expand Down Expand Up @@ -434,7 +434,7 @@ func (h *balanceHotRegionsScheduler) selectDestStore(candidateStoreIDs []uint64,
return
}

func (h *balanceHotRegionsScheduler) adjustBalanceLimit(storeID uint64, storesStat core.StoreHotRegionsStat, setFunc func(limit uint64)) {
func (h *balanceHotRegionsScheduler) adjustBalanceLimit(storeID uint64, storesStat core.StoreHotRegionsStat) uint64 {
srcStoreStatistics := storesStat[storeID]

var hotRegionTotalCount float64
Expand All @@ -444,8 +444,7 @@ func (h *balanceHotRegionsScheduler) adjustBalanceLimit(storeID uint64, storesSt

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

func (h *balanceHotRegionsScheduler) GetHotReadStatus() *core.StoreHotRegionInfos {
Expand Down