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

hotfix: 避免上传镜像后,再次获取镜像列表因网络原因导致任务失败

Browse Source
This commit is contained in:
ioito
2019-08-20 19:40:27 +08:00
parent d0906806e5
commit a2b08010e2
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/zstack.go
+2
View File
@@ -44,6 +44,8 @@ func (self *SZStackGuestDriver) DoScheduleMemoryFilter() bool { return true }
func (self *SZStackGuestDriver) DoScheduleSKUFilter() bool { return false }
func (self *SZStackGuestDriver) DoScheduleStorageFilter() bool { return true }
func (self *SZStackGuestDriver) GetHypervisor() string {
return api.HYPERVISOR_ZSTACK
}
pkg/multicloud/zstack/zstack.go
+17 -7
View File
@@ -316,14 +316,24 @@ func (cli *SZStackClient) _get(resource, resourceId string, spec string) (jsonut
client := httputils.GetDefaultClient()
header := http.Header{}
requestURL := cli.getURL(resource, resourceId, spec)
err := cli.sign(requestURL, "GET", header)
if err != nil {
return nil, err
}
_, resp, err := httputils.JSONRequest(client, context.Background(), "GET", requestURL, header, nil, cli.debug)
if err != nil {
return nil, errors.Wrapf(err, fmt.Sprintf("GET %s %s %s", resource, resourceId, spec))
var resp jsonutils.JSONObject
startTime := time.Now()
for time.Now().Sub(startTime) < time.Minute*5 {
err := cli.sign(requestURL, "GET", header)
if err != nil {
return nil, err
}
_, resp, err = httputils.JSONRequest(client, context.Background(), "GET", requestURL, header, nil, cli.debug)
if err != nil {
if strings.Contains(err.Error(), "exceeded while awaiting headers") {
time.Sleep(time.Second * 5)
continue
}
return nil, errors.Wrapf(err, fmt.Sprintf("GET %s %s %s", resource, resourceId, spec))
}
break
}
if resp.Contains("location") {
location, _ := resp.GetString("location")
return cli.wait(client, header, "get", requestURL, jsonutils.NewDict(), location)