Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix status check nil error in GetVmStatusAsync #1135

Merged
merged 1 commit into from
Jun 10, 2022
Merged

Fix status check nil error in GetVmStatusAsync #1135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions src/core/mcis/manageInfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,12 +536,14 @@ func GetMcisStatus(nsId string, mcisId string) (*McisStatusInfo, error) {

for _, v := range vmList {
// set master IP of MCIS (Default rule: select 1st Running VM as master)
vmtmp, _ := GetVmObject(nsId, mcisId, v)
if vmtmp.Status == StatusRunning {
mcisStatus.MasterVmId = vmtmp.Id
mcisStatus.MasterIp = vmtmp.PublicIP
mcisStatus.MasterSSHPort = vmtmp.SSHPort
break
vmtmp, err := GetVmObject(nsId, mcisId, v)
if err == nil {
if vmtmp.Status == StatusRunning {
mcisStatus.MasterVmId = vmtmp.Id
mcisStatus.MasterIp = vmtmp.PublicIP
mcisStatus.MasterSSHPort = vmtmp.SSHPort
break
}
}
}

Expand Down Expand Up @@ -897,14 +899,17 @@ func GetVmSpecId(nsId string, mcisId string, vmId string) string {
func GetVmStatusAsync(wg *sync.WaitGroup, nsId string, mcisId string, vmId string, results *McisStatusInfo) error {
defer wg.Done() //goroutine sync done

vmStatusTmp, err := GetVmStatus(nsId, mcisId, vmId)
if err != nil {
common.CBLog.Error(err)
vmStatusTmp.Status = StatusFailed
vmStatusTmp.SystemMessage = err.Error()
if nsId != "" && mcisId != "" && vmId != "" {
vmStatusTmp, err := GetVmStatus(nsId, mcisId, vmId)
if err != nil {
common.CBLog.Error(err)
vmStatusTmp.Status = StatusFailed
vmStatusTmp.SystemMessage = err.Error()
}
if vmStatusTmp != (TbVmStatusInfo{}) {
results.Vm = append(results.Vm, vmStatusTmp)
}
}

results.Vm = append(results.Vm, vmStatusTmp)
return nil
}

Expand Down