WIP for cancelling coalesce for VDI activation

Signed-off-by: Damien Thenot <[email protected]>

Author: Nambrok

drivers/blktap2.py

@@ -18,7 +18,7 @@
 # blktap2: blktap/tapdisk management layer
 #
 
-from sm_typing import Any, Callable, ClassVar, Dict, override
+from sm_typing import Any, Callable, ClassVar, Dict, override, List
 
 from abc import abstractmethod
 
@@ -1657,6 +1657,85 @@ def activate(self, sr_uuid, vdi_uuid, writable, caching_params):
             time.sleep(1)
         raise util.SMException("VDI %s locked" % vdi_uuid)
 
+    def _get_host_ref(self) -> str:
+        sr = self.target.vdi.sr
+        if sr.is_shared():
+            util.SMlog("DAMS: SR is shared")
+            host_ref = util.get_master_ref(self._session)
+        else:
+            util.SMlog("DAMS: SR is not shared, using local host")
+            host_ref = sr.host_ref
+        return host_ref
+
+    def _get_chain(self, cowutil, extractUuid) -> List[str]:
+        vdi_chain = []
+        path = self.target.get_vdi_path()
+
+        vdi_chain.append(extractUuid(path))
+        parent = cowutil.getParentNoCheck(path)
+        while parent:
+            vdi_chain.append(extractUuid(parent))
+            parent = cowutil.getParentNoCheck(parent)
+        vdi_chain.reverse()
+        return vdi_chain
+
+    def _check_journal_coalesce_chain(self, sr_uuid, vdi_uuid: str) -> bool:
+        vdi_type = self.target.get_vdi_type()
+        cowutil = getCowUtil(vdi_type)
+        if not cowutil.isCoalesceableOnRemote(): #We only need to stop the coalesce in case of QCOW2
+            return True
+
+        level = 0
+        path = self.target.get_vdi_path()
+
+        # Different extractUUID & journaler function for LVMSR and FileSR
+        journaler = None
+        extractUuid = None
+        if path.startswith("/dev/"): #TODO: How to identify SR type easily, we could ask XAPI since we have the sruuid (and even ref)
+            from lvmcowutil import LvmCowUtil
+            import lvmcache
+            import journaler
+            vgName = "VG_XenStorage-{}".format(sr_uuid)
+            lvmCache = lvmcache.LVMCache(vgName)
+            journaler = journaler.Journaler(lvmCache)
+
+            extractUuid = LvmCowUtil.extractUuid
+        else:
+            from FileSR import FileVDI
+            import fjournaler
+            journaler = fjournaler.Journaler(os.getcwd())
+            extractUuid = FileVDI.extractUuid
+
+        # Get the VDI chain
+        vdi_chain = self._get_chain(cowutil, extractUuid)
+
+        util.SMlog("DAMS: VDI chain:")
+        for vdi in vdi_chain:
+            prefix = "    " * level
+            level += 1
+            util.SMlog("{}{}".format(prefix, vdi))
+
+        if len(vdi_chain) == 1:
+            #We only have a leaf, do nothing
+            util.SMlog("DAMS: VDI is only a leaf, continuing...")
+            return True
+
+        vdi_to_cancel = []
+        for entry in journaler.getAll("coalesce").keys():
+            if entry in vdi_chain:
+                vdi_to_cancel.append(entry)
+                util.SMlog("{} in chain".format(entry))
+
+        # Get the host_ref from the host doing the GC work
+        host_ref = self._get_host_ref()
+        for vdi in vdi_to_cancel:
+            args = {"sr_uuid": sr_uuid, "vdi_uuid": vdi}
+            util.SMlog("args: {}".format(args))
+            self._session.xenapi.host.call_plugin(\
+                host_ref, PLUGIN_ON_SLAVE, "cancel_coalesce_master", args)
+
+        return True
+
     @locking("VDIUnavailable")
     def _activate_locked(self, sr_uuid, vdi_uuid, options):
         """Wraps target.activate and adds a tapdisk"""
@@ -1692,6 +1771,8 @@ def _activate_locked(self, sr_uuid, vdi_uuid, options):
 
             vdi_type = self.target.get_vdi_type()
 
+            self._check_journal_coalesce_chain(sr_uuid, vdi_uuid)
+
             # Take lvchange-p Lock before running
             # tap-ctl open
             # Needed to avoid race with lvchange -p which is

drivers/cleanup.py

@@ -835,8 +835,10 @@ def _call_plug_cancel(self, hostRef):
 
     def _call_plugin_coalesce(self, hostRef):
         args = {"path": self.path, "vdi_type": self.vdi_type}
-        self.sr.xapi.session.xenapi.host.call_plugin( \
+        util.SMlog("DAMS: Calling remote coalesce with: {}".format(args))
+        ret = self.sr.xapi.session.xenapi.host.call_plugin( \
                     hostRef, XAPI.PLUGIN_ON_SLAVE, "commit_tapdisk", args)
+        util.SMlog("DAMS: Remote coalesce returned {}".format(ret))
 
     def _doCoalesceOnHost(self, hostRef):
         self.validate()
@@ -852,6 +854,7 @@ def abortTest():
                 with open(file, "r") as f:
                     if not f.read():
                         #TODO: Need to call commit cancel on the hostRef if we stop
+                        util.SMlog("DAMS: Cancelling")
                         self._call_plug_cancel(hostRef)
                         return True
             except OSError as e:
@@ -862,6 +865,7 @@ def abortTest():
                 return True
             return False
 
+        #TODO: Add exception handling here like when callinng in a runAbortable situation_doCoalesceCOWImage
         Util.runAbortable(lambda: self._call_plugin_coalesce(hostRef),
                           None, self.sr.uuid, abortTest, VDI.POLL_INTERVAL, 0)
 
@@ -2752,7 +2756,7 @@ def _snapshotCoalesce(self, vdi):
             return False
         return True
 
-    def _liveLeafCoalesce(self, vdi) -> bool:
+    def _liveLeafCoalesce(self, vdi: VDI) -> bool:
         util.fistpoint.activate("LVHDRT_coaleaf_delay_3", self.uuid)
         self.lock()
         try:

drivers/on_slave.py

@@ -163,15 +163,29 @@ def refresh_lun_size_by_SCSIid(session, args):
         return "False"
 
 def commit_tapdisk(session, args):
-    path = args["path"]
+    path: str = args["path"]
     vdi_type = args["vdi_type"]
-    #TODO: Miss activating/changing RW, naming should reflect that it does more than coalesceing
+    #TODO: naming should reflect that it does more than coalesceing, like setting volume RW
+
+    def set_RW(path):
+        try:
+            util.pread2(["lvchange", "-p", "rw", path])
+        except:
+            pass
+    #TODO: need to make children RW. Or we let the relink happen with a refresh on master and hope it doesn't corrupt the disk
+    if path.startswith("/dev/"):
+        set_RW(path)
+
     from cowutil import getCowUtil
     cowutil = getCowUtil(vdi_type)
     try:
+        parent = cowutil.getParentNoCheck(path)
+        if parent.startswith("/dev/"):
+            set_RW(parent)
         return str(cowutil.coalesceOnline(path))
     except:
-        return "0"
+        util.logException("Couldn't coalesce online")
+        raise
 
 def commit_cancel(session, args):
     path = args["path"]
@@ -205,6 +219,7 @@ def cancel_coalesce_master(session, args):
 
     # return "True"
 
+    util.SMlog("DAMS cancel_coalesce_master plugin: {}".format(vdi_uuid))
     path = "/run/nonpersistent/sm/{}/gc_running_{}".format(sr_uuid, vdi_uuid)
 
     try:
@@ -236,4 +251,5 @@ def is_openers(session, args):
         "is_openers": is_openers,
         "commit_tapdisk": commit_tapdisk,
         "commit_cancel": commit_cancel,
+        "cancel_coalesce_master": cancel_coalesce_master,
         })