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

Merge pull request #9509 from ioito/hotfix/qx-azure-async-task

Browse Source 
fix(region): azure async task
This commit is contained in:
Zexi Li
2020-12-19 20:02:26 +08:00
committed by GitHub
parent 1a9454fa43 f60c1835d1
commit 52559cd3f9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/multicloud/azure/azure.go
View File

@@ -649,7 +649,7 @@ func _jsonRequest(client *autorest.Client, method, domain, path string, body jso
return ""
}
location := locationFunc(header)
if len(location) > 0 && (body == nil || body.IsZero()) {
if len(location) > 0 && (body == nil || body.IsZero() || !body.Contains("id")) {
err = cloudprovider.Wait(time.Second*10, time.Minute*30, func() (bool, error) {
req := httputils.NewJsonRequest(httputils.GET, location, nil)
lae := AzureResponseError{}
@@ -670,7 +670,7 @@ func _jsonRequest(client *autorest.Client, method, domain, path string, body jso
task := struct {
Status string
Properties struct {
Output *jsonutils.JSONObject
Output *jsonutils.JSONDict
}
}{}
_body.Unmarshal(&task)
@@ -685,9 +685,9 @@ func _jsonRequest(client *autorest.Client, method, domain, path string, body jso
case "Succeeded":
log.Debugf("process %s %s Succeeded", method, path)
if task.Properties.Output != nil {
body = *task.Properties.Output
return true, nil
body = task.Properties.Output
}
return true, nil
case "Failed":
return false, fmt.Errorf("%s %s failed", method, path)
default:
@@ -697,7 +697,7 @@ func _jsonRequest(client *autorest.Client, method, domain, path string, body jso
return false, nil
})
if err != nil {
return nil, errors.Wrapf(err, "time out for waiting %s %s")
return nil, errors.Wrapf(err, "time out for waiting %s %s", method, url)
}
}
return body, nil