From 5d32cc8d283f41189ea60f533ccb05072fc1e9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 15 Apr 2024 10:13:54 +0800 Subject: [PATCH] fix(image): set image upload download timeout 4 hour (#19977) --- pkg/image/models/images.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkg/image/models/images.go b/pkg/image/models/images.go index 0853d33fb2..88bcd9b197 100644 --- a/pkg/image/models/images.go +++ b/pkg/image/models/images.go @@ -163,7 +163,7 @@ func (manager *SImageManager) CustomizeHandlerInfo(info *appsrv.SHandlerInfo) { switch info.GetName(nil) { case "get_details", "create", "update": - info.SetProcessTimeout(time.Minute * 120).SetWorkerManager(imgStreamingWorkerMan) + info.SetProcessTimeout(time.Hour * 4).SetWorkerManager(imgStreamingWorkerMan) } } @@ -195,14 +195,6 @@ func (manager *SImageManager) InitializeData() error { return nil } -func (manager *SImageManager) SetHandlerProcessTimeout(info *appsrv.SHandlerInfo, r *http.Request) time.Duration { - if r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/images") { - log.Debugf("upload image, set process timeout to 4 hour!!!") - return 4 * time.Hour - } - return manager.SSharableVirtualResourceBaseManager.SetHandlerProcessTimeout(info, r) -} - func (manager *SImageManager) GetPropertyDetail(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) { appParams := appsrv.AppContextGetParams(ctx) appParams.OverrideResponseBodyWrapper = true