opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

仅忽略 no such service错误,否则以最新api结果为准

Browse Source
This commit is contained in:
ioito
2019-07-19 17:34:10 +08:00
parent f4aaa159ca
commit 1f8bb67e24
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/openstack/region.go
+9 -9
View File
@@ -327,8 +327,8 @@ func (region *SRegion) Delete(service, url string, microversion string) (*http.R
func (region *SRegion) CinderList(url string, microversion string, body jsonutils.JSONObject) (http.Header, jsonutils.JSONObject, error) {
for _, service := range []string{"volumev3", "volumev2", "volume"} {
header, resp, err := region.Get(service, url, microversion, body)
if err == nil {
return header, resp, nil
if err == nil || !strings.Contains(err.Error(), "No such service") {
return header, resp, err
}
log.Debugf("failed to list %s by service %s error: %v, try another", url, service, err)
}
@@ -341,7 +341,7 @@ func (region *SRegion) CinderGet(url string, microversion string, body jsonutils
}
for _, service := range []string{"volumev3", "volumev2", "volume"} {
header, resp, err := region.Get(service, url, microversion, body)
if err == nil || err == cloudprovider.ErrNotFound {
if err == nil || err == cloudprovider.ErrNotFound || !strings.Contains(err.Error(), "No such service") {
return header, resp, err
}
log.Debugf("failed to get %s by service %s error: %v, try another", url, service, err)
@@ -352,8 +352,8 @@ func (region *SRegion) CinderGet(url string, microversion string, body jsonutils
func (region *SRegion) CinderCreate(url string, microversion string, body jsonutils.JSONObject) (http.Header, jsonutils.JSONObject, error) {
for _, service := range []string{"volumev3", "volumev2", "volume"} {
header, resp, err := region.Post(service, url, microversion, body)
if err == nil {
return header, resp, nil
if err == nil || !strings.Contains(err.Error(), "No such service") {
return header, resp, err
}
log.Debugf("failed to create %s by service %s error: %v, try another", url, service, err)
}
@@ -366,8 +366,8 @@ func (region *SRegion) CinderDelete(url string, microversion string) (*http.Resp
}
for _, service := range []string{"volumev3", "volumev2", "volume"} {
resp, err := region.Delete(service, url, microversion)
if err == nil {
return resp, nil
if err == nil || !strings.Contains(err.Error(), "No such service") {
return resp, err
}
log.Debugf("failed to delete %s by service %s error: %v, try another", url, service, err)
}
@@ -377,8 +377,8 @@ func (region *SRegion) CinderDelete(url string, microversion string) (*http.Resp
func (region *SRegion) CinderAction(url string, microversion string, body jsonutils.JSONObject) (http.Header, jsonutils.JSONObject, error) {
for _, service := range []string{"volumev3", "volumev2", "volume"} {
header, resp, err := region.Post(service, url, microversion, body)
if err == nil {
return header, resp, nil
if err == nil || !strings.Contains(err.Error(), "No such service") {
return header, resp, err
}
log.Debugf("failed to operate %s by service %s error: %v, try another", url, service, err)
}