lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-09 07:54:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): return sql error

Browse Source
This commit is contained in:
Qu Xuan
2021-08-11 18:26:11 +08:00
parent 1306de980a
commit f664cc25a9
123 changed files with 692 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/scheduler/algorithm/predicates/cloudregion_schedtag_predicate.go
View File

@@ -83,7 +83,7 @@ func (p *CloudregionSchedtagPredicate) GetCandidateResource(c core.Candidater) I
if zone == nil {
return nil
}
region := zone.GetRegion()
region, _ := zone.GetRegion()
if region == nil {
return nil
}

11
pkg/scheduler/algorithm/predicates/network_predicate.go
View File

@@ -185,10 +185,13 @@ func IsNetworkAvailable(
}
}
if wire != "" && !utils.HasPrefix(wire, n.WireId) && !utils.HasPrefix(wire, n.GetWire().GetName()) {
return FailReason{
Reason: fmt.Sprintf("Wire %s != %s", wire, n.WireId),
Type: NetworkWire,
if wire != "" && !utils.HasPrefix(wire, n.WireId) {
_wire, _ := n.GetWire()
if !utils.HasPrefix(wire, _wire.GetName()) {
return FailReason{
Reason: fmt.Sprintf("Wire %s != %s", wire, n.WireId),
Type: NetworkWire,
}
}
}