@xen-orchestra/backups 0.62.0 → 0.64.0

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/IncrementalRemote.mjs

@@ -115,6 +115,7 @@ class IncrementalRemoteVmBackupRunner extends AbstractRemote {
       // for healthcheck
       this._tags = metadata.vm.tags
     }
+    this._hasTransferredData = transferList.length > 0
   }
 }
 

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/_Abstract.mjs

@@ -18,6 +18,7 @@ const asyncEach = async (iterable, fn, thisArg = iterable) => {
 }
 
 export const Abstract = class AbstractVmBackupRunner {
+  _hasTransferredData
   // calls fn for each function, warns of any errors, and throws only if there are no writers left
   async _callWriters(fn, step, parallel = true) {
     const writers = this._writers
@@ -71,6 +72,14 @@ export const Abstract = class AbstractVmBackupRunner {
     if (this._healthCheckSr === undefined) {
       return
     }
+    if (this._hasTransferredData === undefined) {
+      throw new Error('Missing tag to check there are some transferred data ')
+    }
+
+    if (!this._hasTransferredData) {
+      Task.info(`No healthCheck needed because no data was transferred.`)
+      return
+    }
 
     // check if current VM has tags
     const tags = this._tags

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.62.0",
+  "version": "0.64.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -25,12 +25,12 @@
     "@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.2.0",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
     "@xen-orchestra/disk-transform": "^1.1.0",
-    "@xen-orchestra/fs": "^4.6.0",
+    "@xen-orchestra/fs": "^4.6.3",
     "@xen-orchestra/log": "^0.7.1",
     "@xen-orchestra/qcow2": "^1.0.0",
     "@xen-orchestra/template": "^0.1.0",
@@ -52,7 +52,7 @@
     "uuid": "^9.0.0",
     "value-matcher": "^0.2.0",
     "vhd-lib": "^4.14.0",
-    "xen-api": "^4.7.2",
+    "xen-api": "^4.7.4",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
@@ -62,7 +62,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^8.3.0"
+    "@xen-orchestra/xapi": "^8.4.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {