opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ioito
2019-05-21 21:29:05 +08:00
parent e878330938
commit d2c9c7d740
97 changed files with 2810 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/disk_schedtag_predicate.go
+1 -1
View File
@@ -116,7 +116,7 @@ func (p *DiskSchedtagPredicate) DoSelect(
return p.GetUsedStorages(res, input.(*diskW).Backend)
}
func (p *DiskSchedtagPredicate) GetCandidateResourceSortScore(selectRes ISchedtagCandidateResource) int {
func (p *DiskSchedtagPredicate) GetCandidateResourceSortScore(selectRes ISchedtagCandidateResource) int64 {
return selectRes.(*api.CandidateStorage).GetFreeCapacity()
}
pkg/scheduler/algorithm/predicates/network_schedtag_predicate.go
+2 -2
View File
@@ -143,12 +143,12 @@ func (p *NetworkSchedtagPredicate) OnSelectEnd(u *core.Unit, c core.Candidater,
p.BaseSchedtagPredicate.OnSelectEnd(p, u, c, count)
}
func (p *NetworkSchedtagPredicate) GetCandidateResourceSortScore(selectRes ISchedtagCandidateResource) int {
func (p *NetworkSchedtagPredicate) GetCandidateResourceSortScore(selectRes ISchedtagCandidateResource) int64 {
cnt, err := selectRes.(*api.CandidateNetwork).GetFreeAddressCount()
if err != nil {
return -1
}
return cnt
return int64(cnt)
}
func (p *NetworkSchedtagPredicate) DoSelect(
pkg/scheduler/algorithm/predicates/predicates.go
+1 -1
View File
@@ -241,7 +241,7 @@ type ISchedtagPredicateInstance interface {
DoSelect(c core.Candidater, input ISchedtagCustomer, res []ISchedtagCandidateResource) []ISchedtagCandidateResource
AddSelectResult(index int, selectRes []ISchedtagCandidateResource, output *core.AllocatedResource)
GetCandidateResourceSortScore(candidate ISchedtagCandidateResource) int
GetCandidateResourceSortScore(candidate ISchedtagCandidateResource) int64
}
type BaseSchedtagPredicate struct {