From 6fe2a6938f5ff8fa5c94ce5adb14979e4b217ffd Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Wed, 3 Jul 2019 17:28:32 +0800 Subject: [PATCH] fix image download timout --- pkg/image/tasks/image_copy_from_url_task.go | 2 +- pkg/util/zstack/image.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/image/tasks/image_copy_from_url_task.go b/pkg/image/tasks/image_copy_from_url_task.go index 8621aeac6f..393382bbe8 100644 --- a/pkg/image/tasks/image_copy_from_url_task.go +++ b/pkg/image/tasks/image_copy_from_url_task.go @@ -46,7 +46,7 @@ func (self *ImageCopyFromUrlTask) OnInit(ctx context.Context, obj db.IStandalone self.SetStage("OnImageImportComplete", nil) taskman.LocalTaskRun(self, func() (jsonutils.JSONObject, error) { header := http.Header{} - resp, err := httputils.Request(nil, ctx, httputils.GET, copyFrom, header, nil, false) + resp, err := httputils.Request(httputils.GetTimeoutClient(0), ctx, httputils.GET, copyFrom, header, nil, false) if err != nil { return nil, err } diff --git a/pkg/util/zstack/image.go b/pkg/util/zstack/image.go index f93fc6dfb2..569df62c7b 100644 --- a/pkg/util/zstack/image.go +++ b/pkg/util/zstack/image.go @@ -271,7 +271,7 @@ func (region *SRegion) CreateImage(zoneId string, imageName, format, osType, des header.Add("X-IMAGE-UUID", image.UUID) header.Add("X-IMAGE-SIZE", fmt.Sprintf("%d", size)) header.Add("Content-Type", body.FormDataContentType()) - resp, err := httputils.Request(httputils.GetDefaultClient(), context.Background(), "POST", image.BackupStorageRefs[0].InstallPath, header, body, false) + resp, err := httputils.Request(httputils.GetTimeoutClient(0), context.Background(), "POST", image.BackupStorageRefs[0].InstallPath, header, body, false) if err != nil { return nil, err }