linstor fixes

Author: Wescoeur

drivers/LinstorSR.py

@@ -1894,7 +1894,7 @@ def detach(self, sr_uuid, vdi_uuid) -> None:
         while vdi_uuid:
             try:
                 path = self._linstor.build_device_path(self._linstor.get_volume_name(vdi_uuid))
-                parent_vdi_uuid = self.sr.linstorcowutil.get_info(vdi_uuid).parentUuid
+                parent_vdi_uuid = self.linstorcowutil.get_info(vdi_uuid).parentUuid
             except Exception:
                 break
 
@@ -1957,11 +1957,11 @@ def resize(self, sr_uuid, vdi_uuid, size) -> str:
             self._linstor.resize(self.uuid, new_volume_size)
         else:
             if new_volume_size != old_volume_size:
-                self.sr.linstorcowutil.inflate(
+                self.linstorcowutil.inflate(
                     self.sr._journaler, self.uuid, self.path,
                     new_volume_size, old_volume_size
                 )
-            self.sr.linstorcowutil.set_size_virt_fast(self.path, size)
+            self.linstorcowutil.set_size_virt_fast(self.path, size)
 
         # Reload size attributes.
         self._load_this()
@@ -1995,8 +1995,8 @@ def compose(self, sr_uuid, vdi1, vdi2) -> None:
         if not blktap2.VDI.tap_pause(self.session, self.sr.uuid, self.uuid):
             raise util.SMException('Failed to pause VDI {}'.format(self.uuid))
         try:
-            self.sr.linstorcowutil.set_parent(self.path, parent_path, False)
-            self.sr.linstorcowutil.set_hidden(parent_path)
+            self.linstorcowutil.set_parent(self.path, parent_path, False)
+            self.linstorcowutil.set_hidden(parent_path)
             self.sr.session.xenapi.VDI.set_managed(
                 self.sr.srcmd.params['args'][0], False
             )
@@ -2120,7 +2120,7 @@ def _load_this(self):
             self.size = volume_info.virtual_size
             self.parent = ''
         else:
-            image_info = self.sr.linstorcowutil.get_info(self.uuid)
+            image_info = self.linstorcowutil.get_info(self.uuid)
             self.hidden = image_info.hidden
             self.size = image_info.sizeVirt
             self.parent = image_info.parentUuid

drivers/linstor-manager

@@ -27,10 +27,13 @@ import XenAPI
 import XenAPIPlugin
 
 from json import JSONEncoder
+from functools import partial
+
 from cowutil import getCowUtil
 from linstorcowutil import LinstorCowUtil
 from linstorjournaler import LinstorJournaler
 from linstorvolumemanager import get_controller_uri, get_local_volume_openers, LinstorVolumeManager
+
 import json
 import LinstorSR
 import lock
@@ -282,7 +285,7 @@ def get_ip_addr_of_pif(session, pif_uuid):
     return ip_addr
 
 
-def extract_uuid(device_path):
+def extract_uuid(linstor, device_path):
     return linstor.get_volume_uuid_from_device_path(
         device_path.rstrip('\n')
     )
@@ -419,7 +422,7 @@ def get_info(session, args):
         )
 
         image_info = cowutil.getInfo(
-            device_path, extract_uuid, include_parent, False
+            device_path, partial(extract_uuid, linstor), include_parent, False
         )
         return json.dumps(image_info.__dict__)
     except Exception as e:
@@ -449,7 +452,7 @@ def get_parent(session, args):
             logger=util.SMlog
         )
 
-        return cowutil.getParent(device_path, extract_uuid)
+        return cowutil.getParent(device_path, partial(extract_uuid, linstor))
     except Exception as e:
         util.SMlog('linstor-manager:get_parent error: {}'.format(e))
         raise

drivers/linstorcowutil.py

@@ -77,7 +77,10 @@ def log_failed_call(target_host, next_target, device_path, vdi_uuid, remote_meth
         target_host, device_path, vdi_uuid, remote_method, next_target, e
     ), priority=util.LOG_DEBUG)
 
-def linstorhostcall(local_method, remote_method):
+def linstorhostcall(local_method, remote_method=None):
+    if not remote_method:
+        remote_method = local_method
+
     def decorated(response_parser):
         def wrapper(*args, **kwargs):
             self = args[0]
@@ -216,7 +219,7 @@ def check(self, vdi_uuid, ignore_missing_footer=False, fast=False):
         }
         return self._check(vdi_uuid, **kwargs)
 
-    @linstorhostcall(CowUtil.check, 'check')
+    @linstorhostcall('check')
     def _check(self, vdi_uuid, response):
         return CowUtil.CheckResult(response)
 
@@ -227,7 +230,7 @@ def get_info(self, vdi_uuid, include_parent=True):
         }
         return self._get_info(vdi_uuid, self._extract_uuid, **kwargs)
 
-    @linstorhostcall(CowUtil.getInfo, 'getInfo')
+    @linstorhostcall('getInfo')
     def _get_info(self, vdi_uuid, response):
         obj = json.loads(response)
 
@@ -242,42 +245,42 @@ def _get_info(self, vdi_uuid, response):
 
         return image_info
 
-    @linstorhostcall(CowUtil.hasParent, 'hasParent')
+    @linstorhostcall('hasParent')
     def has_parent(self, vdi_uuid, response):
         return util.strtobool(response)
 
     def get_parent(self, vdi_uuid):
         return self._get_parent(vdi_uuid, self._extract_uuid)
 
-    @linstorhostcall(CowUtil.getParent, 'getParent')
+    @linstorhostcall('getParent')
     def _get_parent(self, vdi_uuid, response):
         return response
 
-    @linstorhostcall(CowUtil.getSizeVirt, 'getSizeVirt')
+    @linstorhostcall('getSizeVirt')
     def get_size_virt(self, vdi_uuid, response):
         return int(response)
 
-    @linstorhostcall(CowUtil.getMaxResizeSize, 'getMaxResizeSize')
+    @linstorhostcall('getMaxResizeSize')
     def get_max_resize_size(self, vdi_uuid, response):
         return int(response)
 
-    @linstorhostcall(CowUtil.getSizePhys, 'getSizePhys')
+    @linstorhostcall('getSizePhys')
     def get_size_phys(self, vdi_uuid, response):
         return int(response)
 
-    @linstorhostcall(CowUtil.getAllocatedSize, 'getAllocatedSize')
+    @linstorhostcall('getAllocatedSize')
     def get_allocated_size(self, vdi_uuid, response):
         return int(response)
 
-    @linstorhostcall(CowUtil.getDepth, 'getDepth')
+    @linstorhostcall('getDepth')
     def get_depth(self, vdi_uuid, response):
         return int(response)
 
-    @linstorhostcall(CowUtil.getKeyHash, 'getKeyHash')
+    @linstorhostcall('getKeyHash')
     def get_key_hash(self, vdi_uuid, response):
         return response or None
 
-    @linstorhostcall(CowUtil.getBlockBitmap, 'getBlockBitmap')
+    @linstorhostcall('getBlockBitmap')
     def get_block_bitmap(self, vdi_uuid, response):
         return base64.b64decode(response)
 
@@ -297,31 +300,31 @@ def _get_drbd_size(self, cowutil_inst, path):
 
     @linstormodifier()
     def create(self, path, size, static, msize=0):
-        return self._call_local_method_or_fail(CowUtil.create, path, size, static, msize)
+        return self._call_local_method_or_fail(self._cowutil.create, path, size, static, msize)
 
     @linstormodifier()
     def set_size_phys(self, path, size, debug=True):
-        return self._call_local_method_or_fail(CowUtil.setSizePhys, path, size, debug)
+        return self._call_local_method_or_fail(self._cowutil.setSizePhys, path, size, debug)
 
     @linstormodifier()
     def set_parent(self, path, parentPath, parentRaw=False):
-        return self._call_local_method_or_fail(CowUtil.setParent, path, parentPath, parentRaw)
+        return self._call_local_method_or_fail(self._cowutil.setParent, path, parentPath, parentRaw)
 
     @linstormodifier()
     def set_hidden(self, path, hidden=True):
-        return self._call_local_method_or_fail(CowUtil.setHidden, path, hidden)
+        return self._call_local_method_or_fail(self._cowutil.setHidden, path, hidden)
 
     @linstormodifier()
     def set_key(self, path, key_hash):
-        return self._call_local_method_or_fail(CowUtil.setKey, path, key_hash)
+        return self._call_local_method_or_fail(self._cowutil.setKey, path, key_hash)
 
     @linstormodifier()
     def kill_data(self, path):
-        return self._call_local_method_or_fail(CowUtil.killData, path)
+        return self._call_local_method_or_fail(self._cowutil.killData, path)
 
     @linstormodifier()
     def snapshot(self, path, parent, parentRaw, msize=0, checkEmpty=True):
-        return self._call_local_method_or_fail(CowUtil.snapshot, path, parent, parentRaw, msize, checkEmpty)
+        return self._call_local_method_or_fail(self._cowutil.snapshot, path, parent, parentRaw, msize, checkEmpty)
 
     def inflate(self, journaler, vdi_uuid, vdi_path, new_size, old_size):
         # Only inflate if the LINSTOR volume capacity is not enough.
@@ -377,30 +380,30 @@ def set_size_virt(self, path, size, jFile):
             'size': size,
             'jFile': jFile
         }
-        return self._call_method(CowUtil.setSizeVirt, 'setSizeVirt', path, use_parent=False, **kwargs)
+        return self._call_method(self._cowutil.setSizeVirt, 'setSizeVirt', path, use_parent=False, **kwargs)
 
     @linstormodifier()
     def set_size_virt_fast(self, path, size):
         kwargs = {
             'size': size
         }
-        return self._call_method(CowUtil.setSizeVirtFast, 'setSizeVirtFast', path, use_parent=False, **kwargs)
+        return self._call_method(self._cowutil.setSizeVirtFast, 'setSizeVirtFast', path, use_parent=False, **kwargs)
 
     @linstormodifier()
     def force_parent(self, path, parentPath, parentRaw=False):
         kwargs = {
             'parentPath': str(parentPath),
             'parentRaw': parentRaw
         }
-        return self._call_method(CowUtil.setParent, 'setParent', path, use_parent=False, **kwargs)
+        return self._call_method(self._cowutil.setParent, 'setParent', path, use_parent=False, **kwargs)
 
     @linstormodifier()
     def force_coalesce(self, path):
-        return int(self._call_method(CowUtil.coalesce, 'coalesce', path, use_parent=True))
+        return int(self._call_method(self._cowutil.coalesce, 'coalesce', path, use_parent=True))
 
     @linstormodifier()
     def force_repair(self, path):
-        return self._call_method(CowUtil.repair, 'repair', path, use_parent=False)
+        return self._call_method(self._cowutil.repair, 'repair', path, use_parent=False)
 
     @linstormodifier()
     def force_deflate(self, path, newSize, oldSize, zeroize):
@@ -478,12 +481,12 @@ def _raise_openers_exception(self, device_path, e):
 
     def _call_local_method(self, local_method, device_path, *args, **kwargs):
         if isinstance(local_method, str):
-            local_method = getattr(self, local_method)
+            local_method = getattr(self._cowutil, local_method)
 
         try:
             def local_call():
                 try:
-                    return local_method(self._cowutil, device_path, *args, **kwargs)
+                    return local_method(device_path, *args, **kwargs)
                 except util.CommandException as e:
                     if e.code == errno.EROFS or e.code == errno.EMEDIUMTYPE:
                         raise ErofsLinstorCallException(e)  # Break retry calls.
@@ -510,7 +513,7 @@ def _call_method(self, local_method, remote_method, device_path, use_parent, *ar
         # we must check where this last one is open instead of the child.
 
         if isinstance(local_method, str):
-            local_method = getattr(self, local_method)
+            local_method = getattr(self._cowutil, local_method)
 
         # A. Try to write locally...
         try:
@@ -569,7 +572,7 @@ def remote_call():
 
             if no_host_found:
                 try:
-                    return local_method(self._cowutil, device_path, *args, **kwargs)
+                    return local_method(device_path, *args, **kwargs)
                 except Exception as e:
                     self._raise_openers_exception(device_path, e)