@xen-orchestra/backups 0.48.0 → 0.49.0

package/_runners/_vmRunners/_AbstractXapi.mjs

@@ -240,6 +240,26 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       })
     }, 'writer.beforeBackup()')
 
+    const vm = this._vm
+
+    // block migration during the backup on the VM itself, not the latest snapshot
+    {
+      const { pool_migrate, migrate_send } = vm.blocked_operations
+
+      const reason = 'VM migration is blocked during backup'
+      await vm.update_blocked_operations({ pool_migrate: reason, migrate_send: reason })
+
+      $defer(() =>
+        // 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({
+          migrate_send: migrate_send === undefined || migrate_send === reason ? null : migrate_send,
+          pool_migrate: pool_migrate === undefined || pool_migrate === reason ? null : pool_migrate,
+        })
+      )
+    }
+
     await this._fetchJobSnapshots()
 
     await this._selectBaseVm()
@@ -247,7 +267,6 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
     await this._cleanMetadata()
     await this._removeUnusedSnapshots()
 
-    const vm = this._vm
     const isRunning = vm.power_state === 'Running'
     const startAfter = isRunning && (settings.offlineBackup ? 'backup' : settings.offlineSnapshot && 'snapshot')
     if (startAfter) {
@@ -261,15 +280,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       }
 
       if (this._writers.size !== 0) {
-        const { pool_migrate = null, migrate_send = null } = this._exportedVm.blocked_operations
-
-        const reason = 'VM migration is blocked during backup'
-        await this._exportedVm.update_blocked_operations({ pool_migrate: reason, migrate_send: reason })
-        try {
-          await this._copy()
-        } finally {
-          await this._exportedVm.update_blocked_operations({ pool_migrate, migrate_send })
-        }
+        await this._copy()
       }
     } finally {
       if (startAfter) {

package/_runners/_writers/_MixinXapiWriter.mjs

@@ -1,4 +1,3 @@
-import { extractOpaqueRef } from '@xen-orchestra/xapi'
 import assert from 'node:assert/strict'
 
 import { HealthCheckVmBackup } from '../../HealthCheckVmBackup.mjs'
@@ -49,23 +48,18 @@ export const MixinXapiWriter = (BaseClass = Object) =>
             if (await this.#isAlreadyOnHealthCheckSr(baseVm)) {
               healthCheckVmRef = await Task.run(
                 { name: 'cloning-vm' },
-                async () =>
-                  await xapi
-                    .callAsync('VM.clone', this._targetVmRef, `Health Check - ${baseVm.name_label}`)
-                    .then(extractOpaqueRef)
+                async () => await xapi.callAsync('VM.clone', this._targetVmRef, `Health Check - ${baseVm.name_label}`)
               )
             } else {
               healthCheckVmRef = await Task.run(
                 { name: 'copying-vm' },
                 async () =>
-                  await xapi
-                    .callAsync(
-                      'VM.copy',
-                      this._targetVmRef,
-                      `Health Check - ${baseVm.name_label}`,
-                      this._healthCheckSr.$ref
-                    )
-                    .then(extractOpaqueRef)
+                  await xapi.callAsync(
+                    'VM.copy',
+                    this._targetVmRef,
+                    `Health Check - ${baseVm.name_label}`,
+                    this._healthCheckSr.$ref
+                  )
               )
             }
             const healthCheckVm =

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.48.0",
+  "version": "0.49.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -25,19 +25,19 @@
     "@vates/decorate-with": "^2.1.0",
     "@vates/disposable": "^0.1.5",
     "@vates/fuse-vhd": "^2.1.0",
-    "@vates/nbd-client": "^3.0.1",
+    "@vates/nbd-client": "^3.0.2",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/fs": "^4.1.6",
+    "@xen-orchestra/fs": "^4.1.7",
     "@xen-orchestra/log": "^0.6.0",
     "@xen-orchestra/template": "^0.1.0",
-    "app-conf": "^2.3.0",
+    "app-conf": "^3.0.0",
     "compare-versions": "^6.0.0",
     "d3-time-format": "^4.1.0",
     "decorator-synchronized": "^0.6.0",
     "golike-defer": "^0.5.1",
     "human-format": "^1.2.0",
-    "limit-concurrency-decorator": "^0.5.0",
+    "limit-concurrency-decorator": "^0.6.0",
     "lodash": "^4.17.20",
     "ms": "^2.1.3",
     "node-zone": "^0.4.0",
@@ -47,18 +47,18 @@
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
     "vhd-lib": "^4.9.2",
-    "xen-api": "^3.0.0",
+    "xen-api": "^4.0.0",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
     "fs-extra": "^11.1.0",
     "rimraf": "^5.0.1",
-    "sinon": "^17.0.1",
+    "sinon": "^18.0.0",
     "test": "^3.2.1",
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^5.0.1"
+    "@xen-orchestra/xapi": "^6.0.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {