@xen-orchestra/backups 0.47.0 → 0.48.1

package/_runners/VmsRemote.mjs

@@ -19,6 +19,7 @@ const DEFAULT_REMOTE_VM_SETTINGS = {
   exportRetention: 0,
   healthCheckSr: undefined,
   healthCheckVmsWithTags: [],
+  healthCheckTimeout: '10m',
   maxExportRate: 0,
   maxMergedDeltasPerRun: Infinity,
   nRetriesVmBackupFailures: 0,

package/_runners/VmsXapi.mjs

@@ -24,6 +24,7 @@ const DEFAULT_XAPI_VM_SETTINGS = {
   fullInterval: 0,
   healthCheckSr: undefined,
   healthCheckVmsWithTags: [],
+  healthCheckTimeout: '10m',
   maxExportRate: 0,
   maxMergedDeltasPerRun: Infinity,
   nRetriesVmBackupFailures: 0,

package/_runners/_vmRunners/_AbstractXapi.mjs

@@ -240,6 +240,18 @@ 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 = null, migrate_send = null } = vm.blocked_operations
+
+      const reason = 'VM migration is blocked during backup'
+      await vm.update_blocked_operations({ pool_migrate: reason, migrate_send: reason })
+
+      $defer(() => vm.update_blocked_operations({ pool_migrate, migrate_send }))
+    }
+
     await this._fetchJobSnapshots()
 
     await this._selectBaseVm()
@@ -247,7 +259,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 +272,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/_MixinRemoteWriter.mjs

@@ -8,6 +8,7 @@ import { HealthCheckVmBackup } from '../../HealthCheckVmBackup.mjs'
 import { ImportVmBackup } from '../../ImportVmBackup.mjs'
 import { Task } from '../../Task.mjs'
 import * as MergeWorker from '../../merge-worker/index.mjs'
+import ms from 'ms'
 
 const { info, warn } = createLogger('xo:backups:MixinBackupWriter')
 
@@ -107,8 +108,10 @@ export const MixinRemoteWriter = (BaseClass = Object) =>
             restoredVm = await xapi.waitObject(restoredId)
           }
           try {
+            const timeout = ms(this._settings.healthCheckTimeout)
             await new HealthCheckVmBackup({
               restoredVm,
+              timeout,
               xapi,
             }).run()
           } finally {

package/_runners/_writers/_MixinXapiWriter.mjs

@@ -3,6 +3,7 @@ import assert from 'node:assert/strict'
 
 import { HealthCheckVmBackup } from '../../HealthCheckVmBackup.mjs'
 import { Task } from '../../Task.mjs'
+import ms from 'ms'
 
 export const MixinXapiWriter = (BaseClass = Object) =>
   class MixinXapiWriter extends BaseClass {
@@ -70,8 +71,10 @@ export const MixinXapiWriter = (BaseClass = Object) =>
             const healthCheckVm =
               xapi.getObject(healthCheckVmRef, undefined) ?? (await xapi.waitObject(healthCheckVmRef))
             await healthCheckVm.add_tags('xo:no-bak=Health Check')
+            const timeout = ms(this._settings.healthCheckTimeout)
             await new HealthCheckVmBackup({
               restoredVm: healthCheckVm,
+              timeout,
               xapi,
             }).run()
           } finally {

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.47.0",
+  "version": "0.48.1",
   "engines": {
     "node": ">=14.18"
   },
@@ -47,7 +47,7 @@
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
     "vhd-lib": "^4.9.2",
-    "xen-api": "^3.0.0",
+    "xen-api": "^3.0.1",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^5.0.0"
+    "@xen-orchestra/xapi": "^5.0.1"
   },
   "license": "AGPL-3.0-or-later",
   "author": {