opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 12:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(scheduler): sku by region and fill onecloud vpc networks

Browse Source
This commit is contained in:
Zexi Li
2020-12-10 21:12:06 +08:00
parent 84f02c1f76
commit a78c565d4f
3 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/sku_predicate.go
+15 -3
View File
@@ -45,13 +45,25 @@ func (p *InstanceTypePredicate) Execute(u *core.Unit, c core.Candidater) (bool,
d := u.SchedData()
regionId := c.Getter().Region().Id
regionName := c.Getter().Region().Name
zoneId := c.Getter().Zone().Id
zoneName := c.Getter().Zone().Name
instanceType := d.InstanceType
sku := skuman.GetByZone(instanceType, zoneId)
if sku == nil {
h.Exclude(fmt.Sprintf("Not found server sku %s at zone %s", instanceType, zoneName))
reqRegion := d.PreferRegion
reqZone := d.PreferZone
if reqRegion != "" && reqZone == "" {
sku := skuman.GetByRegion(instanceType, regionId)
if sku == nil {
h.Exclude(fmt.Sprintf("Not found server sku %s at region %s", instanceType, regionName))
}
} else {
sku := skuman.GetByZone(instanceType, zoneId)
if sku == nil {
h.Exclude(fmt.Sprintf("Not found server sku %s at zone %s", instanceType, zoneName))
}
}
return h.GetResult()