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

Merge pull request #1347 from Zexi/feature/schedule-guestdriver-interface

Browse Source 
scheduler: add schedule filter interface to guestdriver
This commit is contained in:
Zexi Li
2019-06-26 21:25:36 +08:00
committed by GitHub
parent 5ad9458736 fcf600f6b2
commit 439d3fe0d2
15 changed files with 64 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/guest/cpu_predicate.go
+1 -1
View File
@@ -34,7 +34,7 @@ func (f *CPUPredicate) Clone() core.FitPredicate {
}
func (f *CPUPredicate) PreExecute(u *core.Unit, cs []core.Candidater) (bool, error) {
if u.IsPublicCloudProvider() {
if !u.GetHypervisorDriver().DoScheduleCPUFilter() {
return false, nil
}
pkg/scheduler/algorithm/predicates/guest/memory_predicate.go
+1 -1
View File
@@ -35,7 +35,7 @@ func (p *MemoryPredicate) Clone() core.FitPredicate {
}
func (p *MemoryPredicate) PreExecute(u *core.Unit, cs []core.Candidater) (bool, error) {
if u.IsPublicCloudProvider() {
if !u.GetHypervisorDriver().DoScheduleMemoryFilter() {
return false, nil
}
pkg/scheduler/algorithm/predicates/guest/storage_predicate.go
+1 -1
View File
@@ -41,7 +41,7 @@ func (p *StoragePredicate) Clone() core.FitPredicate {
}
func (p *StoragePredicate) PreExecute(u *core.Unit, cs []core.Candidater) (bool, error) {
if u.IsPublicCloudProvider() {
if !u.GetHypervisorDriver().DoScheduleStorageFilter() {
return false, nil
}
return true, nil
pkg/scheduler/algorithm/predicates/predicates.go
+1 -4
View File
@@ -336,10 +336,7 @@ func (p *BaseSchedtagPredicate) PreExecute(sp ISchedtagPredicateInstance, u *cor
return false, nil
}
p.Hypervisor = computeapi.HOSTTYPE_HYPERVISOR[u.SchedData().Hypervisor]
if len(p.Hypervisor) == 0 {
p.Hypervisor = u.SchedData().Hypervisor
}
p.Hypervisor = u.GetHypervisor()
// always do select step
u.AppendSelectPlugin(sp)
pkg/scheduler/algorithm/predicates/sku_predicate.go
+1 -1
View File
@@ -34,7 +34,7 @@ func (p *InstanceTypePredicate) Clone() core.FitPredicate {
}
func (p *InstanceTypePredicate) PreExecute(u *core.Unit, cs []core.Candidater) (bool, error) {
if u.SchedData().InstanceType == "" || !u.IsPublicCloudProvider() {
if u.SchedData().InstanceType == "" || !u.GetHypervisorDriver().DoScheduleSKUFilter() {
return false, nil
}
return true, nil