@xen-orchestra/backups 0.69.1 → 0.69.3

package/disks/MergeRemoteDisk.mjs

@@ -190,6 +190,7 @@ export class MergeRemoteDisk {
    */
   async #step_mergeBlocks(parentDisk, childDisk) {
     const getMaxBlockCount = childDisk.getMaxBlockCount()
+    await parentDisk.resize(getMaxBlockCount)
 
     if (this.#isResuming) {
       const alreadyMergedBlocks = []
@@ -213,7 +214,7 @@ export class MergeRemoteDisk {
 
     await this.#mergeBlocks(parentDisk, childDisk)
     await parentDisk.flushMetadata(childDisk)
-    parentDisk.mergeMetadata(childDisk)
+    await parentDisk.mergeMetadata(childDisk)
   }
 
   /**

package/disks/RemoteDisk.mjs

@@ -72,11 +72,10 @@ export class RemoteDisk extends RandomAccessDisk {
   }
 
   /**
-   * Abstract
    * @returns {number} getMaxBlockCount
    */
   getMaxBlockCount() {
-    throw new Error(`getMaxBlockCount must be implemented`)
+    return Math.ceil(this.getVirtualSize() / this.getBlockSize())
   }
 
   /**
@@ -148,6 +147,15 @@ export class RemoteDisk extends RandomAccessDisk {
     throw new Error(`setAllocatedBlocks must be implemented`)
   }
 
+  /**
+   * Abstract
+   * @param {number} blockCount
+   * @returns {Promise<void>}
+   */
+  async resize(blockCount) {
+    throw new Error(`resize must be implemented`)
+  }
+
   /**
    * Abstract
    * @param {RemoteDisk} childDisk
@@ -160,6 +168,7 @@ export class RemoteDisk extends RandomAccessDisk {
   /**
    * Abstract
    * @param {RemoteDisk} childDisk
+   * @returns {Promise<void>}
    */
   mergeMetadata(childDisk) {
     throw new Error(`mergeMetadata must be implemented`)

package/disks/RemoteVhdDisk.mjs

@@ -165,17 +165,6 @@ export class RemoteVhdDisk extends RemoteDisk {
     return await this.isDirectory()
   }
 
-  /**
-   * @returns {number} getMaxBlockCount
-   */
-  getMaxBlockCount() {
-    if (this.#vhd === undefined) {
-      throw new Error(`can't call getMaxBlockCount of a RemoteVhdDisk before init`)
-    }
-
-    return this.#vhd.header.maxTableEntries
-  }
-
   /**
    * Checks if the VHD contains a specific block.
    * @param {number} index
@@ -327,6 +316,20 @@ export class RemoteVhdDisk extends RemoteDisk {
     }
   }
 
+  /**
+   * Ensure that the disk can handle at least the new block count.
+   * @param {number} blockCount
+   * @returns {Promise<void>}
+   */
+  async resize(blockCount) {
+    if (this.#vhd === undefined) {
+      throw new Error(`can't call resize of a RemoteVhdDisk before init`)
+    }
+
+    // Checks that the BAT is at least as big as the provided block count, if not, increases it and shift the blocks position
+    await this.#vhd.ensureBatSize(blockCount)
+  }
+
   /**
    * Writes Block Allocation Table
    * @param {RemoteDisk} childDisk
@@ -353,6 +356,7 @@ export class RemoteVhdDisk extends RemoteDisk {
 
   /**
    * @param {RemoteVhdDisk} childDisk
+   * @returns {Promise<void>}
    */
   async mergeMetadata(childDisk) {
     const childDiskMetadata = childDisk.getMetadata()

package/disks/RemoteVhdDiskChain.mjs

@@ -238,6 +238,7 @@ export class RemoteVhdDiskChain extends RemoteDisk {
 
   /**
    * @param {RemoteVhdDisk} childDisk
+   * @returns {Promise<void>}
    */
   mergeMetadata(childDisk) {
     throw new Error(`Can't merge metadata on a disk chain`)

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.69.1",
+  "version": "0.69.3",
   "engines": {
     "node": ">=14.18"
   },