@xen-orchestra/backups 0.57.0 → 0.58.1

package/README.md

@@ -12,6 +12,19 @@ Installation of the [npm package](https://npmjs.org/package/@xen-orchestra/backu
 npm install --save @xen-orchestra/backups
 ```
 
+## Usage
+
+## Changing the default backup configuration
+
+This library receives a backup configuration from `xo-server` or `xo-proxy`. This configuration is split between multiple properties:
+
+- `config` contains values related to the general backup configuration
+- `config.defaultSettings`, `config.vm.defaultSettings` and `config.metadata.defaultSettings` contain values related to backup jobs default settings:
+  - `config.vm.defaultSettings` is related to VM backup jobs (see [DEFAULT_XAPI_VM_SETTINGS](https://github.com/vatesfr/xen-orchestra/blob/568e14f7eec7c3ddf685d324ad4733a3ef577995/%40xen-orchestra/backups/_runners/VmsRemote.mjs#L15))
+  - `config.metadata.defaultSettings` is related to metadata backup jobs (see [DEFAULT_METADATA_SETTINGS](https://github.com/vatesfr/xen-orchestra/blob/568e14f7eec7c3ddf685d324ad4733a3ef577995/%40xen-orchestra/backups/_runners/Metadata.mjs#L12))
+  - `config.defaultSettings` is related to all backup jobs (see [DEFAULT_SETTINGS](https://github.com/vatesfr/xen-orchestra/blob/568e14f7eec7c3ddf685d324ad4733a3ef577995/%40xen-orchestra/backups/_runners/_Abstract.mjs#L7))
+  - in case of duplicate value, `config.vm.defaultSettings` and `config.metadata.defaultSettings` will prevail over `config.defaultSettings`, and a defined job setting will prevail over any `defaultSettings`
+
 ## Contributions
 
 Contributions are _very_ welcomed, either on the documentation or on

package/RemoteAdapter.mjs

@@ -700,7 +700,11 @@ export class RemoteAdapter {
     }
   }
 
-  async outputStream(path, input, { checksum = true, maxStreamLength, streamLength, validator = noop } = {}) {
+  async outputStream(
+    path,
+    input,
+    { checksum = !this._handler.isEncrypted, maxStreamLength, streamLength, validator = noop } = {}
+  ) {
     const container = watchStreamSize(input)
     await this._handler.outputStream(path, input, {
       checksum,

package/_cleanVm.mjs

@@ -133,6 +133,7 @@ export async function checkAliases(
           await handler.unlink(alias)
         }
       }
+      continue
     }
 
     if (!isVhdFile(target)) {
@@ -575,7 +576,7 @@ export async function cleanVm(
       if (mergedSize) {
         // all disks are now key disk
         metadata.isVhdDifferencing = {}
-        for (const id of Object.values(metadata.vdis ?? {})) {
+        for (const id of Object.keys(metadata.vdis ?? {})) {
           metadata.isVhdDifferencing[`${id}.vhd`] = false
         }
       }

package/_getOldEntries.mjs

@@ -27,7 +27,7 @@ const LTR_DEFINITIONS = {
         copy.date(date.date() - firstDayOfWeek)
         // warning, the year in term of week may different from YYYY
         // since the computation of the first week of a year is timezone dependant
-        return copy.format('gggg-WW')
+        return copy.format('gggg-ww')
       }
     },
     ancestor: 'daily',

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.57.0",
+  "version": "0.58.1",
   "engines": {
     "node": ">=14.18"
   },
@@ -28,7 +28,7 @@
     "@vates/nbd-client": "^3.1.2",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/fs": "^4.3.0",
+    "@xen-orchestra/fs": "^4.4.0",
     "@xen-orchestra/log": "^0.7.1",
     "@xen-orchestra/template": "^0.1.0",
     "app-conf": "^3.0.0",
@@ -59,7 +59,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^7.9.0"
+    "@xen-orchestra/xapi": "^7.11.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {

package/runBackupWorker.mjs

@@ -4,10 +4,22 @@ import { fork } from 'child_process'
 const { warn } = createLogger('xo:backups:backupWorker')
 
 const PATH = new URL('_backupWorker.mjs', import.meta.url).pathname
+const DEFAULT_INSPECTOR_PORT = 9229
 
 export function runBackupWorker(params, onLog) {
   return new Promise((resolve, reject) => {
-    const worker = fork(PATH)
+    // run Node inspector on port+1 if --inspect or --inspect-brk
+    const inspectArg = process.execArgv.find(arg => arg.startsWith('--inspect') || arg.startsWith('--inspect-brk'))
+    const execArgv = inspectArg
+      ? [
+          inspectArg.replace(/^(--inspect(-brk)?)(=([^:]+:)?(\d+))?$/, (_, prefix, brk, _fullMatch, host, port) => {
+            const basePort = port ? parseInt(port) : DEFAULT_INSPECTOR_PORT
+            return `${prefix}=${host || ''}${basePort + 1}`
+          }),
+        ]
+      : []
+
+    const worker = fork(PATH, [], { execArgv })
 
     worker.on('exit', (code, signal) => reject(new Error(`worker exited with code ${code} and signal ${signal}`)))
     worker.on('error', reject)