CA-408105: add logging to _finishInterruptedCoalesceLeaf

No error logging is present in two error paths which make diagnosis
difficult/impossible.

Signed-off-by: Mark Syms <mark.syms@cloud.com>

Author: MarkSymsCtx

libs/sm/cleanup.py

@@ -2635,10 +2635,12 @@ def _finishInterruptedCoalesceLeaf(self, childUuid, parentUuid):
         Util.log("*** FINISH LEAF-COALESCE")
         vdi = self.getVDI(childUuid)
         if not vdi:
+            Util.log(f"_finishInterruptedCoalesceLeaf, vdi {childUuid} not found, aborting")
             raise util.SMException("VDI %s not found" % childUuid)
         try:
             self.forgetVDI(parentUuid)
         except XenAPI.Failure:
+            Util.logException('_finishInterruptedCoalesceLeaf')
             pass
         self._updateSlavesOnResize(vdi)
         util.fistpoint.activate("LVHDRT_coaleaf_finish_end", self.uuid)

tests/test_cleanup.py

@@ -9,13 +9,15 @@
 from sm import cleanup
 from sm import fjournaler
 from sm.core import lock
+from sm.core.util import SMException
 
 from sm.core import util
 from sm import vhdutil
 
 from sm import ipc
 
 import XenAPI
+from XenAPI import Failure
 
 MEGA = 1024 * 1024
 
@@ -1962,3 +1964,46 @@ def test_cannot_acquire_if_other_process_holds_sr_lock(self):
         # When
         with self.assertRaises(BlockingIOError):
             gcLock.acquireNoblock()
+
+
+class TestFileSR(TestSR):
+    """
+    Exercise the specfic bits of the FileSR support
+    """
+
+    def setUp(self):
+        super().setUp()
+
+        self.sr_uuid = str(uuid.uuid4())
+
+    def _make_test_sr(self):
+        self.mock_sr =  cleanup.FileSR(self.sr_uuid, self.xapi_mock,
+                                       createLock=False, force=False)
+
+    def test_finishInterruptedCoalesceLeaf_no_vdi(self):
+        self._make_test_sr()
+        self.mock_sr.vdis = {}
+
+        child_vdi_uuid = str(uuid.uuid4())
+        parent_vdi_uuid = str(uuid.uuid4())
+
+        with self.assertRaises(SMException) as sme:
+            self.mock_sr._finishInterruptedCoalesceLeaf(child_vdi_uuid, parent_vdi_uuid)
+
+        self.assertRegex(str(sme.exception), r"VDI \S+ not found")
+
+    def test_finishInterruptedCoalesceLeaf_forget_fail_and_complete(self):
+        child_vdi_uuid = str(uuid.uuid4())
+        parent_vdi_uuid = str(uuid.uuid4())
+
+        self._make_test_sr()
+        self.mock_sr.vdis = {
+            child_vdi_uuid: mock.create_autospec(cleanup.FileVDI)
+        }
+
+        def forgetVdi(self, uuid):
+            raise Failure(f"ForgetVDI {uuid} failed")
+
+        self.xapi_mock.forgetVDI.side_effect = forgetVdi
+
+        self.mock_sr._finishInterruptedCoalesceLeaf(child_vdi_uuid, parent_vdi_uuid)