From 756f13dd7c7dc28c6a2ac72c4edf28095e755787 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Fri, 22 Oct 2021 14:45:03 +0800 Subject: [PATCH] fix(host): ceph snap delete --- pkg/util/cephutils/ceph.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/util/cephutils/ceph.go b/pkg/util/cephutils/ceph.go index 91dd4ef112..65eb69917d 100644 --- a/pkg/util/cephutils/ceph.go +++ b/pkg/util/cephutils/ceph.go @@ -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() }