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 #7820 from swordqiu/hotfix/qj-redfish-power-on-ignore-409-error

Browse Source 
fix: ignore 409 error when doing redfish power on
This commit is contained in:
yunion-ci-robot
2020-09-08 20:23:55 +08:00
committed by GitHub
parent a6eb0c19fa 65141a277c
commit 118ae551af
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/baremetal/manager.go
+10 -1
View File
@@ -61,6 +61,7 @@ import (
"yunion.io/x/onecloud/pkg/mcclient/modules"
"yunion.io/x/onecloud/pkg/util/dhcp"
"yunion.io/x/onecloud/pkg/util/fileutils2"
"yunion.io/x/onecloud/pkg/util/httputils"
"yunion.io/x/onecloud/pkg/util/influxdb"
"yunion.io/x/onecloud/pkg/util/procutils"
"yunion.io/x/onecloud/pkg/util/redfish"
@@ -1402,7 +1403,15 @@ func (b *SBaremetalInstance) DoRedfishPowerOn() error {
b.ClearSSHConfig()
redfishApi := b.GetRedfishCli(ctx)
if redfishApi != nil {
return redfishApi.Reset(ctx, "On")
err := redfishApi.Reset(ctx, "On")
if err != nil {
if httputils.ErrorCode(err) == 409 {
log.Warningf("redfishApi.Reset On fail %s", err)
} else {
return errors.Wrap(err, "redfishApi.Reset On")
}
}
return nil
}
return fmt.Errorf("Baremetal %s redfishApi is nil", b.GetId())
}