From 9a3df26dc152d0ba93445beb63dd4d3583fb0b38 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Fri, 13 Mar 2020 11:01:30 +0800 Subject: [PATCH] download handler set no timeout --- pkg/compute/models/guests.go | 3 --- pkg/hostman/downloader/downloadhandler.go | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index ded804a353..6b59e32db8 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -989,9 +989,6 @@ func (manager *SGuestManager) validateCreateData( if err != nil { return nil, httperrors.NewInputParameterError("Invalid root image: %s", err) } - if len(diskConfig.SnapshotId) > 0 && diskConfig.DiskType != api.DISK_TYPE_SYS { - return nil, httperrors.NewBadRequestError("Snapshot error: disk index 0 but disk type is %s", diskConfig.DiskType) - } // if len(diskConfig.Backend) == 0 { // diskConfig.Backend = STORAGE_LOCAL diff --git a/pkg/hostman/downloader/downloadhandler.go b/pkg/hostman/downloader/downloadhandler.go index 7cbab665da..0bb3400b5f 100644 --- a/pkg/hostman/downloader/downloadhandler.go +++ b/pkg/hostman/downloader/downloadhandler.go @@ -18,7 +18,6 @@ import ( "context" "fmt" "net/http" - "time" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/hostman/hostutils" @@ -65,7 +64,7 @@ func AddDownloadHandler(prefix string, app *appsrv.Application) { func customizeHandlerInfo(info *appsrv.SHandlerInfo) { switch info.GetName(nil) { case "disk_download", "download", "snapshot_download": - info.SetProcessTimeout(time.Minute * 60).SetWorkerManager(streamingWorkerMan) + info.SetProcessNoTimeout().SetWorkerManager(streamingWorkerMan) } }