@xen-orchestra/backups 0.67.1 → 0.67.2

package/ImportVmBackup.mjs

@@ -11,6 +11,7 @@ import pickBy from 'lodash/pickBy.js'
 import { defer } from 'golike-defer'
 import { NegativeDisk } from '@xen-orchestra/disk-transform'
 import { openDiskChain } from './disks/openDiskChain.mjs'
+import { resetVmOtherConfig } from './_otherConfig.mjs'
 
 const { debug, info, warn } = createLogger('xo:backups:importVmBackup')
 async function resolveUuid(xapi, cache, uuid, type) {
@@ -270,6 +271,7 @@ export class ImportVmBackup {
             `${metadata.vm.name_label} (${formatFilenameDate(metadata.timestamp)})`
           ),
           xapi.call('VM.set_name_description', vmRef, desc),
+          resetVmOtherConfig(xapi, vmRef),
         ])
 
         return {

package/_otherConfig.mjs

@@ -70,7 +70,8 @@ export async function getVmDeltaChainLength(xapi, vmRef) {
 
 /**
  *
- * Reset the other_config field of a VM and its VDIs
+ * Reset the other_config field related to backups of a VM and its VDIs
+ *
  *
  * @param {Xapi} xapi
  * @param {String} vmRef

package/_runners/_vmRunners/_AbstractXapi.mjs

@@ -1,5 +1,6 @@
 import assert from 'node:assert'
 import groupBy from 'lodash/groupBy.js'
+import { createLogger } from '@xen-orchestra/log'
 import ignoreErrors from 'promise-toolbox/ignoreErrors'
 import { asyncMap } from '@xen-orchestra/async-map'
 import { decorateMethodsWith } from '@vates/decorate-with'
@@ -17,6 +18,8 @@ import {
   setVmOtherConfig,
 } from '../../_otherConfig.mjs'
 
+const { warn } = createLogger('xo:backups:AbstractXapi')
+
 export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
   constructor({
     config,
@@ -255,28 +258,47 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
           return
         }
         const vdis = snapshotPerDatetime[datetime]
-        let vmRef
+        let vm
         // if there is an attached VM => destroy the VM (Non CBT backups)
         for (const vdi of vdis) {
           const vbds = vdi.$VBDs.filter(({ $VM }) => $VM.is_control_domain === false)
           if (vbds.length > 0) {
             // only one VM linked to this vdi
             // this will throw error for VDI still attached to control domain
+            // since we won't be able to remove an attached VDI
             assert.strictEqual(vbds.length, 1, 'VDI must be free or attached to exactly one VM')
-            const vm = vbds[0].$VM
-            assert.strictEqual(vm.is_a_snapshot, true, `VM must be a snapshot`) // don't delete a VM (especially a control domain)
-
-            const vmRefVdi = vm.$ref
-            // same vm than other vdi of the same batch
-            assert.ok(
-              vmRef === undefined || vmRef === vmRefVdi,
-              '_removeUnusedSnapshots don t handle vdi related to multiple VMs '
-            )
-            vmRef = vmRefVdi
+            const vdiVm = vbds[0].$VM
+            if (!vdiVm.is_a_snapshot) {
+              // don't delete a VM (especially a control domain)
+              warn(
+                `VM ${vdiVm.uuid} (${vdiVm.name_label}) linked to VDI ${vdi.uuid} (${vdi.name_label}) should be a snapshot`
+              )
+              throw new Error(`VM must be a snapshot`)
+            }
+            if (vm !== undefined && vm.$ref !== vdiVm.$ref) {
+              // this VDI is attached to another VM than the other vdi of
+              // this batch
+              // in doubt, do not delete anything
+              warn("_removeUnusedSnapshots don't handle vdi related to multiple VMs ", {
+                vm1: {
+                  label: vm.name_label,
+                  id: vm.$id,
+                },
+                vm2: {
+                  label: vdiVm.name_label,
+                  id: vdiVm.$id,
+                },
+                vdis: vdis.map(({ name_label, $id }) => ({ name_label, $id })),
+              })
+              throw new Error(
+                `_removeUnusedSnapshots don't handle vdi related to multiple VMs ${vm.name_label} and ${vdiVm.name_label}`
+              )
+            }
+            vm = vdiVm
           }
         }
-        if (vmRef !== undefined) {
-          return xapi.VM_destroy(vmRef)
+        if (vm?.$ref !== undefined) {
+          return xapi.VM_destroy(vm.$ref)
         } else {
           return asyncMap(
             vdis.map(async ({ $ref }) => {

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.67.1",
+  "version": "0.67.2",
   "engines": {
     "node": ">=14.18"
   },
@@ -29,10 +29,10 @@
     "@vates/nbd-client": "^3.2.2",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/disk-transform": "^1.2.0",
+    "@xen-orchestra/disk-transform": "^1.2.1",
     "@xen-orchestra/fs": "^4.6.5",
     "@xen-orchestra/log": "^0.7.1",
-    "@xen-orchestra/qcow2": "^1.1.0",
+    "@xen-orchestra/qcow2": "^1.1.1",
     "@xen-orchestra/template": "^0.1.0",
     "app-conf": "^3.0.0",
     "compare-versions": "^6.0.0",
@@ -51,8 +51,8 @@
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
     "value-matcher": "^0.2.0",
-    "vhd-lib": "^4.14.5",
-    "xen-api": "^4.7.5",
+    "vhd-lib": "^4.14.6",
+    "xen-api": "^4.7.6",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
@@ -62,7 +62,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^8.6.1"
+    "@xen-orchestra/xapi": "^8.6.3"
   },
   "license": "AGPL-3.0-or-later",
   "author": {