@xen-orchestra/backups 0.71.1 → 0.71.2

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/_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/package.json

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