@xen-orchestra/backups 0.61.2 → 0.63.0

package/RemoteAdapter.mjs

@@ -708,7 +708,7 @@ export class RemoteAdapter {
         },
       })
     } else {
-      const stream = await toVhdStream({ disk })
+      const stream = await toVhdStream(disk)
       await this.outputStream(path, stream, { validator })
       await validator(path)
     }

package/_incrementalVm.mjs

@@ -12,6 +12,8 @@ import { BASE_DELTA_VDI, COPY_OF, VM_UUID } from './_otherConfig.mjs'
 
 import { XapiDiskSource } from '@xen-orchestra/xapi'
 import { toVhdStream } from 'vhd-lib/disk-consumer/index.mjs'
+import { toQcow2Stream } from '@xen-orchestra/qcow2'
+import { VHD_MAX_SIZE } from '@xen-orchestra/xapi/disks/Xapi.mjs'
 
 const ensureArray = value => (value === undefined ? [] : Array.isArray(value) ? value : [value])
 
@@ -235,8 +237,18 @@ export const importIncrementalVm = defer(async function importIncrementalVm(
           continue
         }
         await xapi.setField('VDI', vdi.$ref, 'name_label', `[Importing] ${vdiRecords[id].name_label}`)
-        const stream = await toVhdStream({ disk })
-        await vdi.$importContent(stream, { cancelToken, format: 'vhd' })
+
+        let stream, format
+        if (vdi.virtual_size > VHD_MAX_SIZE) {
+          stream = await toQcow2Stream(disk)
+          format = 'qcow2'
+        } else {
+          stream = await toVhdStream(disk)
+          format = 'vhd'
+        }
+
+        await vdi.$importContent(stream, { cancelToken, format })
+
         await xapi.setField('VDI', vdi.$ref, 'name_label', vdiRecords[id].name_label)
       }
     }),

package/_runners/_vmRunners/FullXapi.mjs

@@ -13,15 +13,35 @@ export const FullXapi = class FullXapiVmBackupRunner extends AbstractXapi {
     return [FullRemoteWriter, FullXapiWriter]
   }
 
-  _mustDoSnapshot() {
+  async _mustDoSnapshot() {
     const vm = this._vm
-
     const settings = this._settings
-    return (
-      settings.unconditionalSnapshot ||
-      (!settings.offlineBackup && vm.power_state === 'Running') ||
-      settings.snapshotRetention !== 0
-    )
+
+    // General setting forcing snapshot at all times
+    if (settings.unconditionalSnapshot) {
+      return true
+    }
+
+    // If offline backup option is not checked
+    // and vm is running, we make a snapshot
+    if (!settings.offlineBackup && vm.power_state === 'Running') {
+      return true
+    }
+
+    // General setting used for snapshot retention
+    // see schedule in backupJob edition
+    if (settings.snapshotRetention !== 0) {
+      return true
+    }
+
+    const vdis = await this._xapi.getRecords('VDI', await vm.$getDisks())
+    const hasNOBAKtag = vdis.some(idx => idx.name_label.includes('[NOBAK]'))
+
+    // if there is a disk with NOBAK tag
+    // we need to make a snapshot
+    if (hasNOBAKtag) {
+      return true
+    }
   }
   _selectBaseVm() {}
 

package/_runners/_vmRunners/IncrementalXapi.mjs

@@ -23,7 +23,7 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
     return [IncrementalRemoteWriter, IncrementalXapiWriter]
   }
 
-  _mustDoSnapshot() {
+  async _mustDoSnapshot() {
     return true
   }
 

package/_runners/_vmRunners/_AbstractXapi.mjs

@@ -141,7 +141,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
 
     const settings = this._settings
 
-    if (this._mustDoSnapshot()) {
+    if (await this._mustDoSnapshot()) {
       await Task.run({ name: 'snapshot' }, async () => {
         if (!settings.bypassVdiChainsCheck) {
           await vm.$assertHealthyVdiChains()
@@ -324,7 +324,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
     throw new Error('Not implemented')
   }
 
-  _mustDoSnapshot() {
+  async _mustDoSnapshot() {
     throw new Error('Not implemented')
   }
 

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.61.2",
+  "version": "0.63.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -25,13 +25,14 @@
     "@vates/decorate-with": "^2.1.0",
     "@vates/disposable": "^0.1.6",
     "@vates/fuse-vhd": "^2.1.2",
-    "@vates/generator-toolbox": "^1.0.3",
-    "@vates/nbd-client": "^3.1.3",
+    "@vates/generator-toolbox": "^1.0.4",
+    "@vates/nbd-client": "^3.1.4",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/disk-transform": "^1.0.1",
-    "@xen-orchestra/fs": "^4.6.0",
+    "@xen-orchestra/disk-transform": "^1.1.0",
+    "@xen-orchestra/fs": "^4.6.1",
     "@xen-orchestra/log": "^0.7.1",
+    "@xen-orchestra/qcow2": "^1.0.0",
     "@xen-orchestra/template": "^0.1.0",
     "app-conf": "^3.0.0",
     "compare-versions": "^6.0.0",
@@ -50,8 +51,8 @@
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
     "value-matcher": "^0.2.0",
-    "vhd-lib": "^4.13.0",
-    "xen-api": "^4.7.2",
+    "vhd-lib": "^4.14.0",
+    "xen-api": "^4.7.3",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
@@ -61,7 +62,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^8.2.0"
+    "@xen-orchestra/xapi": "^8.3.3"
   },
   "license": "AGPL-3.0-or-later",
   "author": {