opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1924 from swordqiu/hotfix/qj-server-create-timeout-for-external-image-check

Browse Source 
fix: server-create may timeout if external image used
This commit is contained in:
yunion-ci-robot
2019-07-26 13:31:11 +08:00
committed by GitHub
parent 071a450d53 9a1d60552c
commit d69181d060
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cachedimages.go
+2 -2
View File
@@ -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)