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

fix: fail to create encrypted nfs disk

Browse Source
This commit is contained in:
Qiu Jian
2024-04-16 00:18:14 +08:00
parent 24d57b02f8
commit 62ea988107
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/storageman/disk_local.go
+7 -1
View File
@@ -240,7 +240,13 @@ func (d *SLocalDisk) CreateFromImageFuse(ctx context.Context, url string, size i
}
func (d *SLocalDisk) CreateFromTemplate(ctx context.Context, imageId, format string, size int64, encryptInfo *apis.SEncryptInfo) (jsonutils.JSONObject, error) {
var imageCacheManager = storageManager.LocalStorageImagecacheManager
imageCacheManager := storageManager.LocalStorageImagecacheManager
return d.createFromTemplateAndResize(ctx, imageId, format, imageCacheManager, encryptInfo, size)
}
func (d *SLocalDisk) createFromTemplateAndResize(
ctx context.Context, imageId, format string, imageCacheManager IImageCacheManger, encryptInfo *apis.SEncryptInfo, size int64,
) (jsonutils.JSONObject, error) {
ret, err := d.createFromTemplate(ctx, imageId, format, imageCacheManager, encryptInfo)
if err != nil {
return nil, err
pkg/hostman/storageman/disk_nas.go
+1 -12
View File
@@ -43,18 +43,7 @@ func NewNasDisk(storage IStorage, id string) *SNasDisk {
func (d *SNasDisk) CreateFromTemplate(ctx context.Context, imageId, format string, size int64, encryptInfo *apis.SEncryptInfo) (jsonutils.JSONObject, error) {
imageCacheManager := storageManager.GetStoragecacheById(d.Storage.GetStoragecacheId())
ret, err := d.SLocalDisk.createFromTemplate(ctx, imageId, format, imageCacheManager, encryptInfo)
if err != nil {
return nil, err
}
retSize, _ := ret.Int("disk_size")
log.Infof("REQSIZE: %d, RETSIZE: %d", size, retSize)
if size > retSize {
params := jsonutils.NewDict()
params.Set("size", jsonutils.NewInt(size))
return d.Resize(ctx, params)
}
return ret, nil
return d.SLocalDisk.createFromTemplateAndResize(ctx, imageId, format, imageCacheManager, encryptInfo, size)
}
func (d *SNasDisk) CreateFromImageFuse(ctx context.Context, url string, size int64, encryptInfo *apis.SEncryptInfo) error {