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

fix: scheduler forecast backup server not work (#399)

Browse Source
This commit is contained in:
Zexi Li
2019-04-15 15:17:10 +08:00
committed by yunion-ci-robot
parent a418df7854
commit eab87ed6df
8 changed files with 83 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/aggregate_predicate.go
+4 -4
View File
@@ -51,10 +51,6 @@ func (p *AggregatePredicate) Clone() core.FitPredicate {
func (p *AggregatePredicate) PreExecute(u *core.Unit, cs []core.Candidater) (bool, error) {
data := u.SchedData()
if !u.ShouldExecuteSchedtagFilter() {
return false, nil
}
allAggs, err := GetAllSchedtags(computemodels.HostManager.KeywordPlural())
if err != nil {
return false, err
@@ -68,6 +64,10 @@ func (p *AggregatePredicate) PreExecute(u *core.Unit, cs []core.Candidater) (boo
func (p *AggregatePredicate) Execute(u *core.Unit, c core.Candidater) (bool, []core.PredicateFailureReason, error) {
h := NewPredicateHelper(p, u, c)
if !u.ShouldExecuteSchedtagFilter(c.Getter().Id()) {
return true, nil, nil
}
if errMsg := p.exec(h); len(errMsg) > 0 {
h.Exclude(errMsg)
}
pkg/scheduler/algorithm/predicates/disk_schedtag_predicate.go
+6 -6
View File
@@ -157,13 +157,13 @@ func (w schedtagStorageW) ResourceType() string {
return models.StorageManager.KeywordPlural()
}
func (p *DiskSchedtagPredicate) check(d *computeapi.DiskConfig, s *api.CandidateStorage, u *core.Unit) (*PredicatedStorage, error) {
func (p *DiskSchedtagPredicate) check(d *computeapi.DiskConfig, s *api.CandidateStorage, u *core.Unit, c core.Candidater) (*PredicatedStorage, error) {
allTags, err := GetAllSchedtags(models.StorageManager.KeywordPlural())
if err != nil {
return nil, err
}
tagPredicate := NewSchedtagPredicate(d.Schedtags, allTags)
shouldExec := u.ShouldExecuteSchedtagFilter()
shouldExec := u.ShouldExecuteSchedtagFilter(c.Getter().Id())
ps := newPredicatedStorage(s, nil, nil)
if shouldExec {
if err := tagPredicate.Check(
@@ -180,11 +180,11 @@ func (p *DiskSchedtagPredicate) check(d *computeapi.DiskConfig, s *api.Candidate
return ps, nil
}
func (p *DiskSchedtagPredicate) checkStorages(d *computeapi.DiskConfig, storages []*api.CandidateStorage, u *core.Unit) ([]*PredicatedStorage, error) {
func (p *DiskSchedtagPredicate) checkStorages(d *computeapi.DiskConfig, storages []*api.CandidateStorage, u *core.Unit, c core.Candidater) ([]*PredicatedStorage, error) {
errs := make([]error, 0)
ret := make([]*PredicatedStorage, 0)
for _, s := range storages {
ps, err := p.check(d, s, u)
ps, err := p.check(d, s, u, c)
if err != nil {
// append err, storage not suit disk
errs = append(errs, err)
@@ -226,7 +226,7 @@ func (p *DiskSchedtagPredicate) Execute(u *core.Unit, c core.Candidater) (bool,
break
}
matchedStorages, err := p.checkStorages(d, fitStorages, u)
matchedStorages, err := p.checkStorages(d, fitStorages, u, c)
if err != nil {
h.Exclude(err.Error())
}
@@ -267,7 +267,7 @@ func (p *DiskSchedtagPredicate) OnSelectEnd(u *core.Unit, c core.Candidater, cou
func (p *DiskSchedtagPredicate) allocatedDiskResource(c core.Candidater, disk *computeapi.DiskConfig, storages []*PredicatedStorage) *schedapi.CandidateDisk {
storage := p.selectStorage(disk, storages)
log.Debugf("Select storage %s:%s for disk: %s", storage.Id, storage.Name, disk.Index)
log.Debugf("Select %s storage %s:%s for disk: %s", c.Getter().Name(), storage.Id, storage.Name, disk.Index)
return &schedapi.CandidateDisk{
Index: disk.Index,
StorageId: storage.Id,