dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid using up the bandwidth of the CDN (#801) 

* rename getdistance to getAffinity

Signed-off-by: 孙伟鹏 <weipeng.swp@alibaba-inc.com>

* CDN has the lowest priority among all peers with the same number of pieces

Signed-off-by: 孙伟鹏 <weipeng.swp@alibaba-inc.com>
This commit is contained in:
sunwp 2021-11-17 10:23:13 +08:00 committed by Gaius
parent 558782af00
commit dc2835a454
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scheduler/core/evaluator/basic/basic_evaluator.go
View File

@ -96,7 +96,7 @@ func (eval *baseEvaluator) Evaluate(parent *supervisor.Peer, child *supervisor.P
load := getHostLoad(parent.Host)
dist := getDistance(parent, child)
dist := getAffinity(parent, child)
return profits * load * dist
}
@ -128,8 +128,8 @@ func getHostLoad(host *supervisor.Host) float64 {
return 1.0 - host.GetUploadLoadPercent()
}
// getDistance 0.0~1.0 larger and better
func getDistance(dst *supervisor.Peer, src *supervisor.Peer) float64 {
// getAffinity 0.0~1.0 larger and better
func getAffinity(dst *supervisor.Peer, src *supervisor.Peer) float64 {
hostDist := 40.0
if dst.Host == src.Host {
hostDist = 0.0

8
scheduler/supervisor/peer.go
View File

@ -404,8 +404,12 @@ func (peer *Peer) SortedValue() int {
defer peer.lock.RUnlock()
pieceCount := peer.TotalPieceCount.Load()
hostLoad := peer.getFreeLoad()
return int(pieceCount*HostMaxLoad + hostLoad)
freeLoad := peer.getFreeLoad()
if peer.Host.IsCDN {
// if peer's host is CDN, peer has the lowest priority among all peers with the same number of pieces
return int(pieceCount * HostMaxLoad)
}
return int(pieceCount*HostMaxLoad + freeLoad)
}
func (peer *Peer) getFreeLoad() int32 {