From 62d63cc5f26de945b45581b08ed11e899e771d10 Mon Sep 17 00:00:00 2001 From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com> Date: Mon, 23 Dec 2024 20:43:56 +0800 Subject: [PATCH] fix(host): delete snapshot from storagehandler misc fix (#21885) --- pkg/hostman/storageman/storage_lvm.go | 4 +++- pkg/hostman/storageman/storage_slvm.go | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/hostman/storageman/storage_lvm.go b/pkg/hostman/storageman/storage_lvm.go index 19efd2d929..9088762edd 100644 --- a/pkg/hostman/storageman/storage_lvm.go +++ b/pkg/hostman/storageman/storage_lvm.go @@ -225,7 +225,9 @@ func (s *SLVMStorage) DeleteSnapshot(ctx context.Context, params interface{}) (j return nil, err } } - snapId := path.Join("/dev", s.GetPath(), input.SnapshotId) + + snapName := "snap_" + input.SnapshotId + snapId := path.Join("/dev", s.GetPath(), snapName) err := lvmutils.LvRemove(snapId) if err != nil { return nil, err diff --git a/pkg/hostman/storageman/storage_slvm.go b/pkg/hostman/storageman/storage_slvm.go index cd1faa8185..f36ff2e7ba 100644 --- a/pkg/hostman/storageman/storage_slvm.go +++ b/pkg/hostman/storageman/storage_slvm.go @@ -109,7 +109,7 @@ func (s *SSLVMStorage) CreateDiskFromSnapshot(ctx context.Context, disk IDisk, i } func (s *SSLVMStorage) DeleteSnapshot(ctx context.Context, params interface{}) (jsonutils.JSONObject, error) { - input, ok := params.(SStorageDeleteSnapshot) + input, ok := params.(*SStorageDeleteSnapshot) if !ok { return nil, hostutils.ParamsError } @@ -139,7 +139,8 @@ func (s *SSLVMStorage) DeleteSnapshot(ctx context.Context, params interface{}) ( } } - snapId := path.Join("/dev", s.GetPath(), input.SnapshotId) + snapName := "snap_" + input.SnapshotId + snapId := path.Join("/dev", s.GetPath(), snapName) err := lvmutils.LvRemove(snapId) if err != nil { return nil, err