LVM COW in progress (to squash)

Signed-off-by: Ronan Abhamon <ronan.abhamon@vates.fr>

Author: Wescoeur

drivers/LVHDSR.py

@@ -28,7 +28,6 @@
 import lvutil
 import lvmcache
 import vhdutil
-import lvhdutil
 import scsiutil
 import lock
 import os
@@ -41,6 +40,7 @@
 from journaler import Journaler
 from refcounter import RefCounter
 from ipc import IPCFlag
+from lvmcowutil import LV_PREFIX, NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX
 from lvmanager import LVActivator
 from vditype import VdiType
 import XenAPI # pylint: disable=import-error
@@ -55,7 +55,7 @@
 import glob
 from constants import CBTLOG_TAG
 from fairlock import Fairlock
-DEV_MAPPER_ROOT = os.path.join('/dev/mapper', lvhdutil.VG_PREFIX)
+DEV_MAPPER_ROOT = os.path.join('/dev/mapper', VG_PREFIX)
 
 geneology: Dict[str, List[str]] = {}
 CAPABILITIES = ["SR_PROBE", "SR_UPDATE", "SR_TRIM",
@@ -559,7 +559,7 @@ def delete(self, uuid) -> None:
 
         self._removeMetadataVolume()
         self.lvmCache.refresh()
-        if len(lvhdutil.getLVInfo(self.lvmCache)) > 0:
+        if len(LvmCowUtil.getVolumeInfo(self.lvmCache)) > 0:
             raise xs_errors.XenError('SRNotEmpty')
 
         if not success:
@@ -596,7 +596,7 @@ def attach(self, uuid) -> None:
 
         # Test Legacy Mode Flag and update if VHD volumes exist
         if self.isMaster and self.legacyMode:
-            vdiInfo = lvhdutil.getVDIInfo(self.lvmCache)
+            vdiInfo = LvmCowUtil.getVDIInfo(self.lvmCache)
             for uuid, info in vdiInfo.items():
                 if VdiType.isCowImage(info.vdiType):
                     self.legacyMode = False
@@ -858,8 +858,8 @@ def _updateStats(self, uuid, virtAllocDelta):
     @deviceCheck
     def probe(self) -> str:
         return lvutil.srlist_toxml(
-                lvutil.scan_srlist(lvhdutil.VG_PREFIX, self.dconf['device']),
-                lvhdutil.VG_PREFIX,
+                lvutil.scan_srlist(VG_PREFIX, self.dconf['device']),
+                VG_PREFIX,
                 ('metadata' in self.srcmd.params['sr_sm_config'] and \
                  self.srcmd.params['sr_sm_config']['metadata'] == 'true'))
 
@@ -869,7 +869,7 @@ def vdi(self, uuid) -> VDI.VDI:
 
     def _loadvdis(self):
         self.virtual_allocation = 0
-        self.vdiInfo = lvhdutil.getVDIInfo(self.lvmCache)
+        self.vdiInfo = LvmCowUtil.getVDIInfo(self.lvmCache)
         self.allVDIs = {}
 
         for uuid, info in self.vdiInfo.items():
@@ -927,7 +927,7 @@ def _handleInterruptedCloneOp(self, origUuid, jval, forceUndo=False):
         we're still in the context of the failed snapshot operation since the
         VBD is paused for the duration of the operation"""
         util.SMlog("*** INTERRUPTED CLONE OP: for %s (%s)" % (origUuid, jval))
-        lvs = lvhdutil.getLVInfo(self.lvmCache)
+        lvs = LvmCowUtil.getVolumeInfo(self.lvmCache)
         baseUuid, clonUuid = jval.split("_")
 
         cowutil = None # TODO
@@ -951,7 +951,7 @@ def _handleInterruptedCloneOp(self, origUuid, jval, forceUndo=False):
             self._undoCloneOp(lvs, origUuid, baseUuid, clonUuid)
             return
 
-        vdis = lvhdutil.getVDIInfo(self.lvmCache)
+        vdis = LvmCowUtil.getVDIInfo(self.lvmCache)
         if vdis[origUuid].scanError or (clonUuid and vdis[clonUuid].scanError):
             util.SMlog("One or both leaves invalid => revert")
             self._undoCloneOp(lvs, origUuid, baseUuid, clonUuid)
@@ -1001,7 +1001,7 @@ def _undoCloneOp(self, lvs, origUuid, baseUuid, clonUuid):
         if VdiType.isCowImage(base.vdiType):
             self.lvActivator.activate(baseUuid, base.name, False)
             origRefcountNormal = 1
-            cow_info = cowutil.getInfo(basePath, lvhdutil.extractUuid, False)
+            cow_info = cowutil.getInfo(basePath, LvmCowUtil.extractUuid, False)
             if cow_info.hidden:
                 cowutil.setHidden(basePath, False)
         elif base.hidden:
@@ -1020,7 +1020,7 @@ def _undoCloneOp(self, lvs, origUuid, baseUuid, clonUuid):
         # inflate the parent to fully-allocated size
         if VdiType.isCowImage(base.vdiType):
             fullSize = lvmcowutil.calcVolumeSize(vhdInfo.sizeVirt)
-            lvmcowutil.inflate(self.journaler, self.uuid, baseUuid, fullSize)
+            lvmcowutil.inflate(self.journaler, self.uuid, baseUuid, base.vdiType, fullSize)
 
         # rename back
         origLV = lvhdutil.LV_PREFIX[base.vdiType] + origUuid
@@ -1037,7 +1037,7 @@ def _undoCloneOp(self, lvs, origUuid, baseUuid, clonUuid):
 
         # update LVM metadata on slaves
         slaves = util.get_slaves_attached_on(self.session, [origUuid])
-        lvhdutil.lvRefreshOnSlaves(self.session, self.uuid, self.vgname,
+        LvmCowUtil.refreshVolumeOnSlaves(self.session, self.uuid, self.vgname,
                 origLV, origUuid, slaves)
 
         util.SMlog("*** INTERRUPTED CLONE OP: rollback success")
@@ -1193,8 +1193,9 @@ def _undoAllInflateJournals(self):
                 if vdi.readonly:
                     self.lvmCache.setReadonly(vdi.lvname, True)
                 if "true" == self.session.xenapi.SR.get_shared(self.sr_ref):
-                    lvhdutil.lvRefreshOnAllSlaves(self.session, self.uuid,
-                            self.vgname, vdi.lvname, uuid)
+                    LvmCowUtil.refreshVolumeOnAllSlaves(
+                        self.session, self.uuid, self.vgname, vdi.lvname, uuid
+                    )
             self.journaler.remove(lvhdutil.JRN_INFLATE, uuid)
         delattr(self, "vdiInfo")
         delattr(self, "allVDIs")
@@ -1224,12 +1225,11 @@ def _undoAllVHDJournals(self):
             # Attempt to reclaim unused space
 
 
-            vhdInfo = cowutil.getInfo(vdi.path, lvhdutil.extractUuid, False)
+            vhdInfo = cowutil.getInfo(vdi.path, LvmCowUtil.extractUuid, False)
             NewSize = lvmcowutil.calcVolumeSize(vhdInfo.sizeVirt)
             if NewSize < fullSize:
-                lvhdutil.deflate(self.lvmCache, vdi.lvname, int(NewSize))
-            lvhdutil.lvRefreshOnAllSlaves(self.session, self.uuid,
-                    self.vgname, vdi.lvname, uuid)
+                lvmcowutil.deflate(self.lvmCache, vdi.lvname, int(NewSize))
+            LvmCowUtil.refreshVolumeOnAllSlaves(self.session, self.uuid, self.vgname, vdi.lvname, uuid)
             self.lvmCache.remove(jlvName)
         delattr(self, "vdiInfo")
         delattr(self, "allVDIs")
@@ -1880,7 +1880,7 @@ def _createSnap(self, snapUuid, snapSizeLV, isNew):
         self.sr.lvActivator.add(snapUuid, snapLV, False)
         parentRaw = (self.vdi_type == VdiType.RAW)
         self._cowutil.snapshot(snapPath, self.path, parentRaw, cowutil.getPreallocationVirtSize())
-        snapParent = self._cowutil.getParent(snapPath, lvhdutil.extractUuid)
+        snapParent = self._cowutil.getParent(snapPath, LvmCowUtil.extractUuid)
 
         snapVDI = LVHDVDI(self.sr, snapUuid)
         snapVDI.read_only = False
@@ -2106,7 +2106,7 @@ def _determineType(self):
             # when doing attach_from_config, the VG won't be there yet
             return False
 
-        lvs = lvhdutil.getLVInfo(self.sr.lvmCache)
+        lvs = LvmCowUtil.getVolumeInfo(self.sr.lvmCache)
         if lvs.get(self.uuid):
             self._initFromLVInfo(lvs[self.uuid])
             return True
@@ -2120,7 +2120,7 @@ def _loadThis(self):
                 self.sr.lvActivator.activate(self.uuid, self.lvname, False)
             return
         try:
-            lvs = lvhdutil.getLVInfo(self.sr.lvmCache, self.lvname)
+            lvs = LvmCowUtil.getVolumeInfo(self.sr.lvmCache, self.lvname)
         except util.CommandException as e:
             raise xs_errors.XenError('VDIUnavailable',
                     opterr='%s (LV scan error)' % os.strerror(abs(e.code)))
@@ -2129,7 +2129,7 @@ def _loadThis(self):
         self._initFromLVInfo(lvs[self.uuid])
         if VdiType.isCowImage(self.vdi_type):
             self.sr.lvActivator.activate(self.uuid, self.lvname, False)
-            vhdInfo = self._cowutil.getInfo(self.path, lvhdutil.extractUuid, False)
+            vhdInfo = self._cowutil.getInfo(self.path, LvmCowUtil.extractUuid, False)
             if not vhdInfo:
                 raise xs_errors.XenError('VDIUnavailable', \
                         opterr='getVHDInfo failed')
@@ -2146,7 +2146,7 @@ def _chainSetActive(self, active, binary, persistent=False):
         vdiList = {self.uuid: self.lvname}
         if VdiType.isCowImage(self.vdi_type):
             vdiList = vhdutil.getParentChain(self.lvname,
-                    lvhdutil.extractUuid, self.sr.vgname)
+                    LvmCowUtil.extractUuid, self.sr.vgname)
         for uuid, lvName in vdiList.items():
             binaryParam = binary
             if uuid != self.uuid:
@@ -2181,10 +2181,9 @@ def _prepareThin(self, attach):
         if self.sr.isMaster:
             # the master can prepare the VDI locally
             if attach:
-                lvhdutil.attachThin(self.sr.journaler, self.sr.uuid, self.uuid)
+                self.lvcowutil.attachThin(self.sr.journaler, self.sr.uuid, self.uuid, self.vdi_type)
             else:
-                lvhdutil.detachThin(self.session, self.sr.lvmCache,
-                        self.sr.uuid, self.uuid)
+                self.lvcowutil.detachThin(self.session, self.sr.lvmCache, self.sr.uuid, self.uuid, self.vdi_type)
         else:
             fn = "attach"
             if not attach:

drivers/blktap2.py

@@ -43,11 +43,11 @@
 import scsiutil
 from syslog import openlog, syslog
 from stat import *  # S_ISBLK(), ...
+from lvmcowutil import NS_PREFIX_LVM
 from vditype import VdiType
 import nfs
 
 import resetvdis
-import lvmcowutil
 
 import VDI as sm
 
@@ -1672,7 +1672,7 @@ def _activate_locked(self, sr_uuid, vdi_uuid, options):
             if hasattr(self.target.vdi.sr, 'DRIVER_TYPE') and \
                self.target.vdi.sr.DRIVER_TYPE == 'lvhd' and \
                VdiType.isCowImage(vdi_type):
-                lock = Lock("lvchange-p", lvhdutil.NS_PREFIX_LVM + sr_uuid)
+                lock = Lock("lvchange-p", NS_PREFIX_LVM + sr_uuid)
                 lock.acquire()
 
             # When we attach a static VDI for HA, we cannot communicate with

drivers/cleanup.py

@@ -52,6 +52,7 @@
 from time import monotonic as _time
 
 from cowutil import CowUtil, getCowUtil
+from lvmcowutil import NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX
 from vditype import VdiType, VdiTypeExtension, VDI_COW_TYPES, VDI_TYPE_TO_EXTENSION
 
 try:
@@ -1023,7 +1024,7 @@ def _tagChildrenForRelink(self):
             child._tagChildrenForRelink()
 
     def _loadInfoParent(self):
-        ret = self.cowutil.getParent(self.path, lvhdutil.extractUuid)
+        ret = self.cowutil.getParent(self.path, LvmCowUtil.extractUuid)
         if ret:
             self.parentUuid = ret
 
@@ -1225,7 +1226,7 @@ def load(self, info=None) -> None:
 
     @staticmethod
     def extractUuid(path):
-        return lvhdutil.extractUuid(path)
+        return LvmCowUtil.extractUuid(path)
 
     def inflate(self, size):
         """inflate the LV containing the VHD to 'size'"""
@@ -1234,7 +1235,7 @@ def inflate(self, size):
         self._activate()
         self.sr.lock()
         try:
-            self.lvmcowutil.inflate(self.sr.journaler, self.sr.uuid, self.uuid, size)
+            self.lvmcowutil.inflate(self.sr.journaler, self.sr.uuid, self.uuid, self.vdi_type, size)
             util.fistpoint.activate("LVHDRT_inflating_the_parent", self.sr.uuid)
         finally:
             self.sr.unlock()
@@ -1249,7 +1250,7 @@ def deflate(self):
         self._activate()
         self.sr.lock()
         try:
-            lvhdutil.deflate(self.sr.lvmCache, self.fileName, self.getSizePhys())
+            self.lvmcowutil.deflate(self.sr.lvmCache, self.fileName, self.getSizePhys())
         finally:
             self.sr.unlock()
         self.sizeLV = self.sr.lvmCache.getSize(self.fileName)
@@ -1478,7 +1479,7 @@ def _setSizeVirt(self, size) -> None:
         self._activate()
         jFile = self.lvmcowutil.createResizeJournal(self.sr.lvmCache, self.uuid)
         try:
-            lvhdutil.setSizeVirt(self.sr.journaler, self.sr.uuid, self.uuid, size, jFile)
+            self.lvmcowutil.setSizeVirt(self.sr.journaler, self.sr.uuid, self.uuid, self.vdi_type, size, jFile)
         finally:
             self.lvmcowutil.destroyResizeJournal(self.sr.lvmCache, self.uuid)
 
@@ -2879,8 +2880,8 @@ class LVHDSR(SR):
 
     def __init__(self, uuid, xapi, createLock, force):
         SR.__init__(self, uuid, xapi, createLock, force)
-        self.vgName = "%s%s" % (lvhdutil.VG_PREFIX, self.uuid)
-        self.path = os.path.join(lvhdutil.VG_LOCATION, self.vgName)
+        self.vgName = "%s%s" % (VG_PREFIX, self.uuid)
+        self.path = os.path.join(VG_LOCATION, self.vgName)
 
         sr_ref = self.xapi.session.xenapi.SR.get_by_uuid(self.uuid)
         other_conf = self.xapi.session.xenapi.SR.get_other_config(sr_ref)
@@ -2957,7 +2958,7 @@ def _scan(self, force):
         for i in range(SR.SCAN_RETRY_ATTEMPTS):
             error = False
             self.lvmCache.refresh()
-            vdis = lvhdutil.getVDIInfo(self.lvmCache)
+            vdis = LvmCowUtil.getVDIInfo(self.lvmCache)
             for uuid, vdiInfo in vdis.items():
                 if vdiInfo.scanError:
                     error = True
@@ -3193,7 +3194,7 @@ def _updateSlavesOnResize(self, vdi) -> None:
         if not slaves:
             util.SMlog("Update-on-resize: %s not attached on any slave" % vdi)
             return
-        lvhdutil.lvRefreshOnSlaves(self.xapi.session, self.uuid, self.vgName,
+        LvmCowUtil.refreshVolumeOnSlaves(self.xapi.session, self.uuid, self.vgName,
                 vdi.fileName, vdi.uuid, slaves)
 
 

drivers/lvhd-thin

@@ -21,8 +21,8 @@
 import sys
 import XenAPIPlugin
 sys.path.append("/opt/xensource/sm/")
+import lvmcowutil
 import util
-import lvhdutil
 from lvmcache import LVMCache
 from journaler import Journaler
 import lvutil
@@ -33,11 +33,11 @@ def attach(session, args):
         os.environ['LVM_SYSTEM_DIR'] = lvutil.MASTER_LVM_CONF
     srUuid = args["srUuid"]
     vdiUuid = args["vdiUuid"]
-    vgName = "%s%s" % (lvhdutil.VG_PREFIX, srUuid)
+    vgName = "%s%s" % (lvmcowutil.VG_PREFIX, srUuid)
     lvmCache = LVMCache(vgName)
     journaler = Journaler(lvmCache)
     try:
-        lvhdutil.attachThin(journaler, srUuid, vdiUuid)
+        lvcowutil.attachThin(journaler, srUuid, vdiUuid, vdiType)
         return str(True)
     except Exception as e:
         util.logException("lvhd-thin:attach %s" % e)
@@ -48,10 +48,10 @@ def detach(session, args):
         os.environ['LVM_SYSTEM_DIR'] = lvutil.MASTER_LVM_CONF
     srUuid = args["srUuid"]
     vdiUuid = args["vdiUuid"]
-    vgName = "%s%s" % (lvhdutil.VG_PREFIX, srUuid)
+    vgName = "%s%s" % (lvmcowutil.VG_PREFIX, srUuid)
     lvmCache = LVMCache(vgName)
     try:
-        lvhdutil.detachThin(session, lvmCache, args["srUuid"], args["vdiUuid"])
+        lvcowutil.detachThin(session, lvmCache, srUuid, vdiUuid, vdiType)
         return str(True)
     except Exception as e:
         util.logException("lvhd-thin:detach %s" % e)