@xen-orchestra/backups 0.46.1 → 0.48.0

package/_backupWorker.mjs

@@ -2,7 +2,10 @@ import { createLogger } from '@xen-orchestra/log'
 import { catchGlobalErrors } from '@xen-orchestra/log/configure'
 
 import Disposable from 'promise-toolbox/Disposable'
+import humanFormat from 'human-format'
 import ignoreErrors from 'promise-toolbox/ignoreErrors'
+import mapValues from 'lodash/mapValues.js'
+import ms from 'ms'
 import { compose } from '@vates/compose'
 import { createCachedLookup } from '@vates/cached-dns.lookup'
 import { createDebounceResource } from '@vates/disposable/debounceResource.js'
@@ -20,7 +23,7 @@ createCachedLookup().patchGlobal()
 
 const logger = createLogger('xo:backups:worker')
 catchGlobalErrors(logger)
-const { debug } = logger
+const { debug, info } = logger
 
 class BackupWorker {
   #config
@@ -149,6 +152,27 @@ process.on('message', async message => {
   debug('message received', { message })
 
   if (message.action === 'run') {
+    const resourceStart = process.resourceUsage()
+    const timeStart = process.hrtime.bigint()
+    info('starting backup')
+
+    process.on('exit', exitCode => {
+      const resourceUsage = mapValues(process.resourceUsage(), (end, key) => end - resourceStart[key])
+      const cpuTotal = resourceUsage.userCPUTime + resourceUsage.systemCPUTime
+      const duration = Number((process.hrtime.bigint() - timeStart) / 1000n) // in μs
+
+      info('process will exit', {
+        duration,
+        exitCode,
+        resourceUsage,
+        summary: {
+          duration: ms(duration / 1000),
+          cpuUsage: Math.round((100 * cpuTotal) / duration) + '%',
+          memoryUsage: humanFormat.bytes(resourceUsage.maxRSS * 1024),
+        },
+      })
+    })
+
     const backupWorker = new BackupWorker(message.data)
     try {
       const result = message.runWithLogs
@@ -177,6 +201,7 @@ process.on('message', async message => {
         status: 'failure',
       })
     } finally {
+      info('backup has ended')
       await ignoreErrors.call(backupWorker.debounceResource.flushAll())
       process.disconnect()
     }

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/_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.46.1",
+  "version": "0.48.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -36,8 +36,10 @@
     "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",
     "lodash": "^4.17.20",
+    "ms": "^2.1.3",
     "node-zone": "^0.4.0",
     "parse-pairs": "^2.0.0",
     "promise-toolbox": "^0.21.0",
@@ -56,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": {