fix: can't delete disabled storage (close #1942)

pull/2046/head
Noah Hsu 2022-10-09 22:20:48 +08:00
parent 8c69260972
commit baebc2fbe9
1 changed files with 9 additions and 7 deletions

View File

@ -182,13 +182,15 @@ func DeleteStorageById(ctx context.Context, id uint) error {
if err != nil { if err != nil {
return errors.WithMessage(err, "failed get storage") return errors.WithMessage(err, "failed get storage")
} }
storageDriver, err := GetStorageByVirtualPath(storage.MountPath) if !storage.Disabled {
if err != nil { storageDriver, err := GetStorageByVirtualPath(storage.MountPath)
return errors.WithMessage(err, "failed get storage driver") if err != nil {
} return errors.WithMessage(err, "failed get storage driver")
// drop the storage in the driver }
if err := storageDriver.Drop(ctx); err != nil { // drop the storage in the driver
return errors.Wrapf(err, "failed drop storage") if err := storageDriver.Drop(ctx); err != nil {
return errors.Wrapf(err, "failed drop storage")
}
} }
// delete the storage in the database // delete the storage in the database
if err := db.DeleteStorageById(id); err != nil { if err := db.DeleteStorageById(id); err != nil {