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 #5485 from rainzm/automated-cherry-pick-of-#5479-upstream-release-3.1

Browse Source 
Automated cherry pick of #5479: fix(scheduler): Candidater's CloudProvider maybe nil
This commit is contained in:
Zexi Li
2020-03-13 11:28:05 +08:00
committed by GitHub
parent 61757b8e8a 8ebb409ef3
commit 9b335e2afa
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/data_manager/candidate_manager.go
+3 -1
View File
@@ -227,7 +227,9 @@ func (cm *CandidateManager) GetCandidates(args CandidateGetArgs) ([]core.Candida
matchCloudprovider := func(r core.Candidater, managerId string) bool {
if managerId != "" {
if r.Getter().Cloudprovider().GetId() == managerId {
cloudProvier := r.Getter().Cloudprovider()
// r who belongs to Provider Onecloud doesn't have cloudprovider
if cloudProvier != nil && cloudProvier.GetId() == managerId {
return true
}
return false