@xen-orchestra/backups 0.69.3 → 0.69.5

package/_runners/_vmRunners/_AbstractXapi.mjs

@@ -310,6 +310,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       // if not => remove it from the list to ensure we won't half destroy VM later
       vm.$VBDs
         .filter(({ $VDI }) => !!$VDI) // filter missing keys
+        .filter(({ $VDI }) => $VDI.$snapshot_of !== undefined) // skip non-snapshot VDIs (e.g., ISOs/CD-ROMs)
         .filter(({ $VDI }) => $VDI && vdiCandidates[$VDI.uuid] === undefined)
         .forEach(({ $VDI: outOfSnapshotsVdi, ...other }) => {
           warn(

package/disks/RemoteVhdDisk.mjs

@@ -16,6 +16,7 @@ import { DISK_TYPES } from 'vhd-lib/_constants.js'
 import { isVhdAlias, resolveVhdAlias } from 'vhd-lib/aliases.js'
 import { stringify } from 'uuid'
 import { dirname, join } from 'node:path'
+import { RemoteVhdDiskChain } from './RemoteVhdDiskChain.mjs'
 
 export class RemoteVhdDisk extends RemoteDisk {
   /**
@@ -255,7 +256,11 @@ export class RemoteVhdDisk extends RemoteDisk {
    * @returns {Promise<number>} blockSize
    */
   async mergeBlock(childDisk, index, isResumingMerge) {
-    if ((await this.isDirectory()) && childDisk instanceof RemoteVhdDisk && (await childDisk.isDirectory())) {
+    if (
+      (childDisk instanceof RemoteVhdDisk || childDisk instanceof RemoteVhdDiskChain) &&
+      (await this.isDirectory()) &&
+      (await childDisk.isDirectory())
+    ) {
       try {
         await this.#handler.rename(childDisk.getBlockPath(index), this.getBlockPath(index))
 

package/disks/RemoteVhdDiskChain.mjs

@@ -134,12 +134,7 @@ export class RemoteVhdDiskChain extends RemoteDisk {
    * @returns {Promise<boolean>} canMergeConcurently
    */
   async canMergeConcurently() {
-    for (const disk of this.#disks) {
-      if (!(await disk.isDirectory())) {
-        return true
-      }
-    }
-    return false
+    return this.isDirectory()
   }
 
   /**
@@ -221,6 +216,21 @@ export class RemoteVhdDiskChain extends RemoteDisk {
     throw new Error(`Can't merge block into a disk chain`)
   }
 
+  /**
+   * Gets a specific block path from the VHD directory disk.
+   * @param {number} index
+   * @returns {string} blockPath
+   */
+  getBlockPath(index) {
+    for (const disk of [...this.#disks].reverse()) {
+      if (disk.hasBlock(index)) {
+        return disk.getBlockPath(index)
+      }
+    }
+
+    throw new Error(`Block ${index} not found in chain`)
+  }
+
   /**
    * @returns {VhdFooter}
    */
@@ -269,4 +279,17 @@ export class RemoteVhdDiskChain extends RemoteDisk {
       await disk.unlink()
     }
   }
+
+  /**
+   * Check if all the disks in the chain are VHD directories.
+   * @returns {Promise<boolean>}
+   */
+  async isDirectory() {
+    for (const disk of this.#disks) {
+      if (!(await disk.isDirectory())) {
+        return false
+      }
+    }
+    return true
+  }
 }

package/package.json

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