fix: can't delete disabled storage (close #1942)
This commit is contained in:
parent
8c69260972
commit
baebc2fbe9
@ -182,6 +182,7 @@ 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")
|
||||||
}
|
}
|
||||||
|
if !storage.Disabled {
|
||||||
storageDriver, err := GetStorageByVirtualPath(storage.MountPath)
|
storageDriver, err := GetStorageByVirtualPath(storage.MountPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithMessage(err, "failed get storage driver")
|
return errors.WithMessage(err, "failed get storage driver")
|
||||||
@ -190,6 +191,7 @@ func DeleteStorageById(ctx context.Context, id uint) error {
|
|||||||
if err := storageDriver.Drop(ctx); err != nil {
|
if err := storageDriver.Drop(ctx); err != nil {
|
||||||
return errors.Wrapf(err, "failed drop storage")
|
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 {
|
||||||
return errors.WithMessage(err, "failed delete storage in database")
|
return errors.WithMessage(err, "failed delete storage in database")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user