opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12496 from ioito/hotfix/qx-ceph-snap-delete

Browse Source 
fix(host): ceph snap delete
This commit is contained in:
Zexi Li
2021-10-22 15:26:49 +08:00
committed by GitHub
parent cb56269f43 756f13dd7c
commit ccbe03881e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/cephutils/ceph.go
+6 -5
View File
@@ -357,11 +357,6 @@ func (self *SSnapshot) Delete() error {
pool := self.image.client.pool
defer self.image.client.SetPool(pool)
err := self.Unprotect()
if err != nil {
return errors.Wrapf(err, "Unprotect %s", self.GetName())
}
chidren, err := self.ListChildren()
if err != nil {
return errors.Wrapf(err, "ListChildren")
@@ -378,6 +373,12 @@ func (self *SSnapshot) Delete() error {
return errors.Wrapf(err, "Flatten")
}
}
err = self.Unprotect()
if err != nil {
return errors.Wrapf(err, "Unprotect %s", self.GetName())
}
return self.Remove()
}