From baebc2fbe9a2233b5bdee4f495a2da57cf5b508d Mon Sep 17 00:00:00 2001 From: Noah Hsu Date: Sun, 9 Oct 2022 22:20:48 +0800 Subject: [PATCH] fix: can't delete disabled storage (close #1942) --- internal/op/storage.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/internal/op/storage.go b/internal/op/storage.go index 8c0c6c12..f1a08194 100644 --- a/internal/op/storage.go +++ b/internal/op/storage.go @@ -182,13 +182,15 @@ func DeleteStorageById(ctx context.Context, id uint) error { if err != nil { return errors.WithMessage(err, "failed get storage") } - storageDriver, err := GetStorageByVirtualPath(storage.MountPath) - if err != nil { - return errors.WithMessage(err, "failed get storage driver") - } - // drop the storage in the driver - if err := storageDriver.Drop(ctx); err != nil { - return errors.Wrapf(err, "failed drop storage") + if !storage.Disabled { + storageDriver, err := GetStorageByVirtualPath(storage.MountPath) + if err != nil { + return errors.WithMessage(err, "failed get storage driver") + } + // drop the storage in the driver + if err := storageDriver.Drop(ctx); err != nil { + return errors.Wrapf(err, "failed drop storage") + } } // delete the storage in the database if err := db.DeleteStorageById(id); err != nil {