From 86c24ccef46cef65be59a8ad7fa2164bcce4f33b Mon Sep 17 00:00:00 2001 From: Mark Syms Date: Fri, 20 Mar 2020 16:38:59 +0000 Subject: [PATCH] CA-331454: Remove leaf coalesce journal immediately before deleting parent otherwise it's inconsistent Signed-off-by: Mark Syms --- drivers/cleanup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py index 220a6daae..19bce3690 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -2112,12 +2112,14 @@ def _doCoalesceLeaf(self, vdi): util.fistpoint.activate("LVHDRT_coaleaf_before_delete", self.uuid) self.deleteVDI(vdi) util.fistpoint.activate("LVHDRT_coaleaf_after_delete", self.uuid) + + util.fistpoint.activate("LVHDRT_coaleaf_before_remove_j", self.uuid) + self.journaler.remove(VDI.JRN_LEAF, vdiUuid) + self.forgetVDI(origParentUuid) self._finishCoalesceLeaf(parent) self._updateSlavesOnResize(parent) - util.fistpoint.activate("LVHDRT_coaleaf_before_remove_j", self.uuid) - self.journaler.remove(VDI.JRN_LEAF, vdiUuid) def _calcExtraSpaceNeeded(self, child, parent): assert(not parent.raw) # raw parents not supported