fix(vhd-lib): return accurate merge size

vatesfr · Nov 22, 2024 · cb42c41 · cb42c41
1 parent 21f0643
commit cb42c41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -43,6 +43,7 @@
 - @xen-orchestra/fs minor
 - @xen-orchestra/web patch
 - @xen-orchestra/web-core minor
+- vhd-lib patch
 - xo-server minor
 - xo-server-perf-alert minor
 - xo-web minor

diff --git a/packages/vhd-lib/Vhd/VhdDirectory.js b/packages/vhd-lib/Vhd/VhdDirectory.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { unpackHeader, unpackFooter, sectorsToBytes } = require('./_utils')
+const { unpackHeader, unpackFooter } = require('./_utils')
 const { createLogger } = require('@xen-orchestra/log')
 const { fuFooter, fuHeader, checksumStruct } = require('../_structs')
 const { test, set: setBitmap } = require('../_bitmap')
@@ -248,7 +248,7 @@ exports.VhdDirectory = class VhdDirectory extends VhdAbstract {
   }
 
   // only works if data are in the same handler
-  // and if the full block is modified in child ( which is the case with xcp)
+  // and if the full block is modified in child (which is the case with xcp)
   // and if the compression type is same on both sides
   async mergeBlock(child, blockId, isResumingMerge = false) {
     const childBlockPath = child._getFullBlockPath?.(blockId)
@@ -281,7 +281,7 @@ exports.VhdDirectory = class VhdDirectory extends VhdAbstract {
       }
     }
     setBitmap(this.#blockTable, blockId)
-    return sectorsToBytes(this.sectorsPerBlock)
+    return this._handler.getSizeOnDisk(this._getFullBlockPath(blockId))
   }
 
   async writeEntireBlock(block) {