fix(linstorvhdutil): coalesce helper returns the sector count now

Without this change we have an error in cleanup.py that interrupts the coalesce algorithm. Signed-off-by: Ronan Abhamon <[email protected]>
xcp-ng · Dec 11, 2024 · 65021ac · 65021ac
1 parent 122b4a1
commit 65021ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/drivers/linstor-manager b/drivers/linstor-manager
@@ -539,8 +539,7 @@ def set_parent(session, args):
 def coalesce(session, args):
     try:
         device_path = args['devicePath']
-        vhdutil.coalesce(device_path)
-        return ''
+        return str(vhdutil.coalesce(device_path))
     except Exception as e:
         util.SMlog('linstor-manager:coalesce error: {}'.format(e))
         raise

diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py
@@ -376,7 +376,7 @@ def force_parent(self, path, parentPath, parentRaw=False):
 
     @linstormodifier()
     def force_coalesce(self, path):
-        return self._call_method(vhdutil.coalesce, 'coalesce', path, use_parent=True)
+        return int(self._call_method(vhdutil.coalesce, 'coalesce', path, use_parent=True))
 
     @linstormodifier()
     def force_repair(self, path):