repair pipeline

Signed-off-by: Ronan Abhamon <[email protected]>

Author: Wescoeur

drivers/LinstorSR.py

@@ -56,7 +56,7 @@
 import xmlrpc.client
 import xs_errors
 
-from cowutil import getVdiTypeFromImageFormat
+from cowutil import CowUtil, getVdiTypeFromImageFormat
 from srmetadata import \
     NAME_LABEL_TAG, NAME_DESCRIPTION_TAG, IS_A_SNAPSHOT_TAG, SNAPSHOT_OF_TAG, \
     TYPE_TAG, VDI_TYPE_TAG, READ_ONLY_TAG, SNAPSHOT_TIME_TAG, \
@@ -1297,7 +1297,7 @@ def _get_vdi_path_and_parent(self, vdi_uuid, volume_name):
 
             # Otherwise it's a COW and a parent can exist.
             linstorcowutil = LinstorCowUtil(self.session, self._linstor, vdi_type)
-            if linstorcowutil.check(vdi_uuid) != cowutil.CheckResult.Success:
+            if linstorcowutil.check(vdi_uuid) != CowUtil.CheckResult.Success:
                 return (None, None)
 
             image_info = linstorcowutil.get_info(vdi_uuid)
@@ -1348,7 +1348,7 @@ def _handle_interrupted_inflate(self, vdi_uuid, old_size):
 
         current_size = volume_info.virtual_size
         assert current_size > 0
-        linstorcowutil.force_deflate(vdi.path, old_size, current_size, zeroize=True)
+        vdi.linstorcowutil.force_deflate(vdi.path, old_size, current_size, zeroize=True)
 
     def _handle_interrupted_clone(
         self, vdi_uuid, clone_info, force_undo=False
@@ -2290,7 +2290,7 @@ def _create_snapshot(self, snap_vdi_type, snap_uuid, snap_of_uuid=None):
         # 2. Write the snapshot content.
         is_raw = (self.vdi_type == VdiType.RAW)
         self.linstorcowutil.snapshot(
-            snap_path, self.path, is_raw, max(self.size, cowutil.getDefaultPreallocationSizeVirt())
+            snap_path, self.path, is_raw, max(self.size, self.linstorcowutil.cowutil.getDefaultPreallocationSizeVirt())
         )
 
         # 3. Get snapshot parent.

drivers/cleanup.py

@@ -18,7 +18,7 @@
 # Script to coalesce and garbage collect COW-based SR's in the background
 #
 
-from sm_typing import Any, Optional, override
+from sm_typing import Any, Optional, List, override
 
 import os
 import os.path
@@ -1524,7 +1524,7 @@ def load(self, info=None) -> None:
 
         self.fileName = self.sr._linstor.get_volume_name(self.uuid)
         self.path = self.sr._linstor.build_device_path(self.fileName)
-        self.linstorcowutil = LinstorCowUtil(self.sr.xapi.session, self.sr._linstor, self.cowutil)
+        self.linstorcowutil = LinstorCowUtil(self.sr.xapi.session, self.sr._linstor, info.vdiType)
 
         if not info:
             try:
@@ -2700,7 +2700,7 @@ def scan(self, force=False) -> None:
         if not util.pathexists(self.path):
             raise util.SMException("directory %s not found!" % self.uuid)
 
-        uuidsPresent: list[str] = []
+        uuidsPresent: List[str] = []
 
         for vdi_type in VDI_COW_TYPES:
             scan_result = self._scan(vdi_type, force)
@@ -3399,17 +3399,18 @@ def _load_vdi_info(self):
                     # Always RAW!
                     info = None
                 elif VdiType.isCowImage(vdi_type):
-                    info = self.linstorcowutil.get_info(vdi_uuid)
+                    info = LinstorCowUtil(self.xapi.session, self._linstor, vdi_type).get_info(vdi_uuid)
                 else:
-                    # Ensure it's not a VHD...
+                    # Ensure it's not a COW image...
+                    linstorcowutil = LinstorCowUtil(self.xapi.session, self._linstor, vdi_type)
                     try:
-                        info = self.linstorcowutil.get_info(vdi_uuid)
+                        info = linstorcowutil.get_info(vdi_uuid)
                     except:
                         try:
-                            self._vhdutil.force_repair(
+                            linstorcowutil.force_repair(
                                 self._linstor.get_device_path(vdi_uuid)
                             )
-                            info = self.linstorcowutil.get_info(vdi_uuid)
+                            info = linstorcowutil.get_info(vdi_uuid)
                         except:
                             info = None
 
@@ -3418,7 +3419,7 @@ def _load_vdi_info(self):
                     ' [VDI {}: failed to load VDI info]: {}'
                     .format(vdi_uuid, e)
                 )
-                info = vhdutil.VHDInfo(vdi_uuid)
+                info = cowutil.CowImageInfo(vdi_uuid)
                 info.error = 1
 
             all_vdi_info[vdi_uuid] = info

drivers/verifyVHDsOnSR.py

@@ -28,6 +28,7 @@
 import VDI
 
 from constants import NS_PREFIX_LVM, VG_LOCATION, VG_PREFIX
+from cowutil import getCowUtil
 from lock import Lock
 from lvmcowutil import LV_PREFIX, LvmCowUtil
 from refcounter import RefCounter