@xen-orchestra/backups 0.52.1 → 0.52.3

package/_runners/_vmRunners/_AbstractXapi.mjs

@@ -264,7 +264,9 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
         }
       })
     })
+  }
 
+  async _removeSnapshotData() {
     // now that we use CBT, we can destroy the data of the snapshot used for this backup
     // going back to a previous version of XO not supporting CBT will create a full backup
     // this will only do something after snapshot and transfer
@@ -280,12 +282,12 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       this._settings.cbtDestroySnapshotData
     ) {
       Task.info('will delete snapshot data')
-      const vdiRefs = await this._xapi.VM_getDisks(this._exportedVm?.$ref)
-      await xapi.call('VM.destroy', this._exportedVm.$ref)
+      const vdiRefs = await this._xapi.VM_getDisks(this._exportedVm.$ref)
+      await this._xapi.call('VM.destroy', this._exportedVm.$ref)
       for (const vdiRef of vdiRefs) {
         try {
           // data_destroy will fail with a VDI_NO_CBT_METADATA error if CBT is not enabled on this VDI
-          await xapi.call('VDI.data_destroy', vdiRef)
+          await this._xapi.call('VDI.data_destroy', vdiRef)
           Task.info(`Snapshot data has been deleted`, { vdiRef })
         } catch (error) {
           Task.warning(`Couldn't deleted snapshot data`, { error, vdiRef })
@@ -333,15 +335,22 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       const reason = 'VM migration is blocked during backup'
       await vm.update_blocked_operations({ pool_migrate: reason, migrate_send: reason })
 
-      $defer(() =>
+      $defer(async () => {
         // delete the entries if they did not exist previously or if they were
         // equal to reason (which happen if a previous backup was interrupted
         // before resetting them)
-        vm.update_blocked_operations({
+        await vm.update_blocked_operations({
           migrate_send: migrate_send === undefined || migrate_send === reason ? null : migrate_send,
           pool_migrate: pool_migrate === undefined || pool_migrate === reason ? null : pool_migrate,
         })
-      )
+
+        // 2024-08-19 - Work-around a XAPI bug where allowed_operations are not properly computed when blocked_operations is updated
+        //
+        // this is a problem because some clients (e.g. XenCenter) use this field to allow operations.
+        //
+        // internal source: https://team.vates.fr/vates/pl/mjmxnce9qfdx587r3qpe4z91ho
+        await vm.$call('update_allowed_operations')
+      })
     }
 
     await this._fetchJobSnapshots()
@@ -373,6 +382,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
 
       await this._fetchJobSnapshots()
       await this._removeUnusedSnapshots()
+      await this._removeSnapshotData()
     }
     await this._healthCheck()
   }

package/_runners/_writers/IncrementalRemoteWriter.mjs

@@ -140,6 +140,7 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
       if (isDifferencing) {
         assert.notStrictEqual(
           parentVdiPaths,
+          undefined,
           'checkbasevdi must be called before updateUuidAndChain for incremental backups'
         )
         const parentPath = parentVdiPaths[dirname(path)]

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.52.1",
+  "version": "0.52.3",
   "engines": {
     "node": ">=14.18"
   },
@@ -25,7 +25,7 @@
     "@vates/decorate-with": "^2.1.0",
     "@vates/disposable": "^0.1.5",
     "@vates/fuse-vhd": "^2.1.1",
-    "@vates/nbd-client": "^3.0.2",
+    "@vates/nbd-client": "^3.1.0",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/fs": "^4.1.7",
@@ -47,7 +47,7 @@
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
     "vhd-lib": "^4.11.0",
-    "xen-api": "^4.0.0",
+    "xen-api": "^4.2.0",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^7.1.0"
+    "@xen-orchestra/xapi": "^7.3.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {