From 65295e5bec011018abc3b164c6923beba710d477 Mon Sep 17 00:00:00 2001 From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com> Date: Tue, 13 Dec 2022 18:32:39 +0800 Subject: [PATCH] fix(region): use qcow2 format on raw disk cache image (#15548) --- pkg/compute/models/disks.go | 7 +++++++ pkg/compute/tasks/disk_create_task.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index 5095ca6c4a..c862cfe8ee 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -1407,6 +1407,13 @@ func (self *SDisk) GetFsFormat() string { return self.FsFormat } +func (self *SDisk) GetCacheImageFormat() string { + if self.DiskFormat == "raw" { + return "qcow2" + } + return self.DiskFormat +} + func (manager *SDiskManager) getDisksByStorage(storage *SStorage) ([]SDisk, error) { disks := make([]SDisk, 0) q := manager.Query().Equals("storage_id", storage.Id) diff --git a/pkg/compute/tasks/disk_create_task.go b/pkg/compute/tasks/disk_create_task.go index 0e5db0b0a0..9a494359c4 100644 --- a/pkg/compute/tasks/disk_create_task.go +++ b/pkg/compute/tasks/disk_create_task.go @@ -46,7 +46,7 @@ func (self *DiskCreateTask) OnInit(ctx context.Context, obj db.IStandaloneModel, self.SetStage("OnStorageCacheImageComplete", nil) input := api.CacheImageInput{ ImageId: imageId, - Format: disk.DiskFormat, + Format: disk.GetCacheImageFormat(), ParentTaskId: self.GetTaskId(), } guest := disk.GetGuest()