opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12789 from rainzm/automated-cherry-pick-of-#12787-upstream-release-3.7

Browse Source 
Automated cherry pick of #12787: fix(esxiagent): update storagecachedimage status from 'ready' to 'active'
This commit is contained in:
Zexi Li
2021-12-02 14:15:11 +08:00
committed by GitHub
parent e8d7985344 a3d8a0facf
commit ca30e96e07
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/storageman/imagecachemanager_agent.go
+3 -2
View File
@@ -24,6 +24,7 @@ import (
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
comapi "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/hostman/hostutils"
@@ -137,7 +138,7 @@ func (c *SAgentImageCacheManager) prefetchImageCacheByCopy(ctx context.Context,
ret.Add(jsonutils.NewInt(dstVmdkInfo.Size()), "size")
ret.Add(jsonutils.NewString(dstPath), "path")
ret.Add(jsonutils.NewString(data.ImageId), "image_id")
_, err = hostutils.RemoteStoragecacheCacheImage(ctx, data.StoragecacheId, data.ImageId, "ready", dstPath)
_, err = hostutils.RemoteStoragecacheCacheImage(ctx, data.StoragecacheId, data.ImageId, comapi.CACHED_IMAGE_STATUS_ACTIVE, dstPath)
if err != nil {
return nil, err
}
@@ -210,7 +211,7 @@ func (c *SAgentImageCacheManager) prefetchImageCacheByUpload(ctx context.Context
remoteImg := localImage.(*jsonutils.JSONDict)
remoteImg.Add(jsonutils.NewString(remotePath), "path")
_, err = hostutils.RemoteStoragecacheCacheImage(ctx, data.StoragecacheId, data.ImageId, "ready", remotePath)
_, err = hostutils.RemoteStoragecacheCacheImage(ctx, data.StoragecacheId, data.ImageId, "active", remotePath)
if err != nil {
return nil, err
}