From 9a1d60552c15ccb2a8f328f90b4262cf460e8e4b Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 25 Jul 2019 21:24:55 +0800 Subject: [PATCH] fix: server-create may timeout if external image used --- pkg/compute/models/cachedimages.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/cachedimages.go b/pkg/compute/models/cachedimages.go index 3ec39c15f8..f8edcd5649 100644 --- a/pkg/compute/models/cachedimages.go +++ b/pkg/compute/models/cachedimages.go @@ -243,7 +243,7 @@ func (manager *SCachedimageManager) GetImageById(ctx context.Context, userCred m imgObj, _ := manager.FetchById(imageId) if imgObj != nil { cachedImage := imgObj.(*SCachedimage) - if !refresh && cachedImage.GetStatus() == cloudprovider.IMAGE_STATUS_ACTIVE && len(cachedImage.GetOSType()) > 0 && cachedImage.isRefreshSessionExpire() { + if !refresh && cachedImage.GetStatus() == cloudprovider.IMAGE_STATUS_ACTIVE && len(cachedImage.GetOSType()) > 0 && !cachedImage.isRefreshSessionExpire() { return cachedImage.GetImage() } else if len(cachedImage.ExternalId) > 0 { // external image, request refresh return cachedImage.requestRefreshExternalImage(ctx, userCred) @@ -266,7 +266,7 @@ func (manager *SCachedimageManager) getImageByName(ctx context.Context, userCred imgObj, _ := manager.FetchByName(userCred, imageId) if imgObj != nil { cachedImage := imgObj.(*SCachedimage) - if !refresh && cachedImage.GetStatus() == cloudprovider.IMAGE_STATUS_ACTIVE && len(cachedImage.GetOSType()) > 0 && cachedImage.isRefreshSessionExpire() { + if !refresh && cachedImage.GetStatus() == cloudprovider.IMAGE_STATUS_ACTIVE && len(cachedImage.GetOSType()) > 0 && !cachedImage.isRefreshSessionExpire() { return cachedImage.GetImage() } else if len(cachedImage.ExternalId) > 0 { // external image, request refresh return cachedImage.requestRefreshExternalImage(ctx, userCred)