@xen-orchestra/backups 0.71.1 → 0.71.3

package/_incrementalVm.mjs

@@ -365,12 +365,16 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
       }
     }),
   ])
-  // recreate VTPMs
-  await Promise.all(
-    (incrementalVm.vtpms ?? []).map(async contents => {
-      await xapi.VTPM_create({ VM: vmRef, contents })
-    })
-  )
+
+  // recreate vtpm (note there is normally only one VTPM per VM at most)
+  const existingVtpmRefs = await xapi.getField('VM', vmRef, 'VTPMs')
+  for (const vtpmRef of existingVtpmRefs ?? []) {
+    await xapi.call('VTPM_destroy', vtpmRef)
+  }
+  for (const contents of incrementalVm.vtpms ?? []) {
+    await xapi.VTPM_create({ VM: vmRef, contents })
+  }
+
   const vm = await xapi.getRecord('VM', vmRef)
   await Promise.all([
     vmRecord.ha_always_run && xapi.setField('VM', vmRef, 'ha_always_run', true),

package/_runners/_vmRunners/_AbstractRemote.mjs

@@ -54,7 +54,7 @@ export const AbstractRemote = class AbstractRemoteVmBackupRunner extends Abstrac
           config,
           healthCheckSr,
           job,
-          scheduleId: schedule.id,
+          schedule,
           vmUuid,
           settings,
         })
@@ -72,7 +72,7 @@ export const AbstractRemote = class AbstractRemoteVmBackupRunner extends Abstrac
             config,
             healthCheckSr,
             job,
-            scheduleId: schedule.id,
+            schedule,
             vmUuid,
             remoteId,
             settings: targetSettings,

package/_runners/_writers/IncrementalXapiWriter.mjs

@@ -65,8 +65,9 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
         snapshotCandidates,
         async snapshot => {
           let diffDisk
+          let activeVdi
           try {
-            const activeVdi = sr.$xapi.getObject(snapshot.$snapshot_of)
+            activeVdi = sr.$xapi.getObject(snapshot.$snapshot_of)
             const userVbds = activeVdi.$VBDs?.filter(vbd => vbd.$VM && !vbd.$VM.is_control_domain) ?? []
             if (userVbds.length !== 1) {
               debug('checkBaseVdis, share vbd ', { ref: snapshot.$ref, userVbds })
@@ -81,7 +82,12 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
               // but it indicates the users played with the blocked operations
               return
             }
-            diffDisk = new XapiDiskSource({ xapi: sr.$xapi, vdiRef: activeVdi.$ref, baseRef: snapshot.$ref })
+            diffDisk = new XapiDiskSource({
+              xapi: sr.$xapi,
+              vdiRef: activeVdi.$ref,
+              baseRef: snapshot.$ref,
+              onlyListChangedBlocks: true,
+            })
             await diffDisk.init()
             if (diffDisk.getBlockIndexes().length === 0) {
               const sourceUuid = snapshot.other_config?.[COPY_OF]
@@ -103,6 +109,10 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
             return
           } finally {
             await diffDisk?.close().catch(error => debug('checkBaseVdis, error closing', error))
+            await sr.$xapi.VDI_disconnectFromControlDomain(snapshot.$ref)
+            if (activeVdi !== undefined) {
+              await sr.$xapi.VDI_disconnectFromControlDomain(activeVdi.$ref)
+            }
           }
         },
         {

package/_runners/_writers/_AbstractAggregatedRemoteWriter.mjs

@@ -107,7 +107,7 @@ export class AbstractAggregatedRemoteWriter {
   }
 
   async getEntriesPerAdapter(adapter) {
-    const scheduleId = this.#props.scheduleId
+    const scheduleId = this.#props.schedule.id
     const vmUuid = this.#props.vmUuid
     return (await adapter.listVmBackups(vmUuid, _ => _.scheduleId === scheduleId)).map(entry => ({
       ...entry,

package/disks/MergeRemoteDisk.mjs

@@ -10,6 +10,7 @@ import { createLogger } from '@xen-orchestra/log'
 
 import { basename, dirname } from 'path'
 import { asyncEach } from '@vates/async-each'
+import { relativeFromFile } from '@xen-orchestra/fs/path'
 
 // @ts-ignore
 const { warn } = createLogger('remote-disk:merge')
@@ -18,6 +19,7 @@ const { warn } = createLogger('remote-disk:merge')
  * @typedef {Object} MergeState
  * @property {{ uuid: string }} child
  * @property {{ uuid: string }} parent
+ * @property { string[]  | undefined} chain
  * @property {number} currentBlock
  * @property {number} mergedDataSize
  * @property {'mergeBlocks' | 'cleanup'} step
@@ -32,6 +34,7 @@ export class MergeRemoteDisk {
   #state = {
     child: { uuid: '0' },
     parent: { uuid: '0' },
+    chain: undefined,
     currentBlock: 0,
     mergedDataSize: 0,
     step: 'mergeBlocks',
@@ -205,6 +208,9 @@ export class MergeRemoteDisk {
     } else {
       this.#state.child = { uuid: childDisk.getUuid() ?? undefined }
       this.#state.parent = { uuid: parentDisk.getUuid() ?? undefined }
+      this.#state.chain = [parentDisk.getPath(), ...childDisk.getPaths()].map(path =>
+        relativeFromFile(this.#statePath, path)
+      )
 
       // Finds first allocated block for the 2 following loops
       while (this.#state.currentBlock < getMaxBlockCount && !childDisk.hasBlock(this.#state.currentBlock)) {

package/disks/RemoteDisk.mjs

@@ -55,6 +55,16 @@ export class RemoteDisk extends RandomAccessDisk {
     throw new Error(`getPath must be implemented`)
   }
 
+  /**
+   * Abstract
+   * Returns an array of disk paths.
+   *
+   * @returns {string[]}
+   */
+  getPaths() {
+    throw new Error(`getPaths must be implemented`)
+  }
+
   /**
    * Abstract
    * @returns {string}

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 {
   /**
@@ -140,6 +141,15 @@ export class RemoteVhdDisk extends RemoteDisk {
     return this.#path
   }
 
+  /**
+   * Returns the disk path in an array.
+   *
+   * @returns {string[]}
+   */
+  getPaths() {
+    return [this.getPath()]
+  }
+
   /**
    * @returns {string}
    */
@@ -259,7 +269,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

@@ -123,6 +123,15 @@ export class RemoteVhdDiskChain extends RemoteDisk {
     return this.#disks[this.#disks.length - 1].getPath()
   }
 
+  /**
+   * Disk chains return an array of disk paths.
+   *
+   * @returns {string[]}
+   */
+  getPaths() {
+    return this.#disks.map(disk => disk.getPath())
+  }
+
   /**
    * @returns {string}
    */
@@ -134,12 +143,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 +225,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 +288,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,12 +8,13 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.71.1",
+  "version": "0.71.3",
   "engines": {
     "node": ">=14.18"
   },
   "scripts": {
     "postversion": "npm publish --access public",
+    "test": "node --test",
     "test-integration": "node --test *.integ.mjs"
   },
   "dependencies": {
@@ -62,7 +63,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^8.7.0"
+    "@xen-orchestra/xapi": "^8.7.1"
   },
   "license": "AGPL-3.0-or-later",
   "author": {