@xen-orchestra/backups 0.50.0 → 0.52.0

package/_runners/VmsXapi.mjs

@@ -15,6 +15,7 @@ const noop = Function.prototype
 
 const DEFAULT_XAPI_VM_SETTINGS = {
   bypassVdiChainsCheck: false,
+  cbtDestroySnapshotData: false,
   checkpointSnapshot: false,
   concurrency: 2,
   copyRetention: 0,

package/_runners/_vmRunners/IncrementalXapi.mjs

@@ -147,8 +147,13 @@ export const IncrementalXapi = class IncrementalXapiVmBackupRunner extends Abstr
       ...lastExportedVdis.map(({ other_config }) => Number(other_config[DELTA_CHAIN_LENGTH] ?? 0))
     )
     const fullInterval = this._settings.fullInterval
-    if ( fullInterval !== 0 && fullInterval < deltaChainLength + 1) {
-      debug('not using base VM because fullInterval reached', { fullInterval, deltaChainLength, eq: fullInterval < deltaChainLength + 1, dc1: deltaChainLength + 1 })
+    if (fullInterval !== 0 && fullInterval <= deltaChainLength + 1) {
+      debug('not using base VM because fullInterval reached', {
+        fullInterval,
+        deltaChainLength,
+        eq: fullInterval < deltaChainLength + 1,
+        dc1: deltaChainLength + 1,
+      })
       return
     }
 

package/_runners/_vmRunners/_AbstractXapi.mjs

@@ -157,7 +157,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
         }
 
         const snapshotRef = await vm[settings.checkpointSnapshot ? '$checkpoint' : '$snapshot']({
-          ignoreNobakVdis: true,
+          ignoredVdisTag: '[NOBAK]',
           name_label: this._getSnapshotNameLabel(vm),
           unplugVusbs: true,
         })
@@ -227,12 +227,11 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
         ...allSettings[scheduleId],
         ...allSettings[this._vm.uuid],
       }
-      // ensure we never delete the last one
-      const retention = Math.max(settings.snapshotRetention ?? 0, 1)
-
+      // ensure we never delete the last one for delta
+      const minRetention = this.job.mode === 'delta' ? 1 : 0
+      const retention = Math.max(settings.snapshotRetention ?? 0, minRetention)
       await asyncMap(getOldEntries(retention, datetimes), async datetime => {
         const vdis = snapshotPerDatetime[datetime]
-
         let vmRef
         // if there is an attached VM => destroy the VM (Non CBT backups)
         for (const vdi of vdis) {
@@ -274,10 +273,11 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       this._exportedVm?.is_a_snapshot &&
       // user don't want to keep the snapshot data
       this._settings.snapshotRetention === 0 &&
-      // preferNbd is not a guarantee that the backup used NBD, depending on the network configuration
+      // preferNbd is not a guarantee that the backup used NBD, depending on the network configuration,
+      // in that case next runs will be full, but there is not an easy way to prevent that
       this._settings.preferNbd &&
       // only delete snapshost data if the config allows it
-      this.config.purgeSnapshotData
+      this._settings.cbtDestroySnapshotData
     ) {
       Task.info('will delete snapshot data')
       const vdiRefs = await this._xapi.VM_getDisks(this._exportedVm?.$ref)
@@ -285,7 +285,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       for (const vdiRef of vdiRefs) {
         try {
           // data_destroy will fail with a VDI_NO_CBT_METADATA error if CBT is not enabled on this VDI
-          await xapi.VDI_dataDestroy(vdiRef)
+          await xapi.call('VDI.data_destroy', vdiRef)
           Task.info(`Snapshot data has been deleted`, { vdiRef })
         } catch (error) {
           Task.warning(`Couldn't deleted snapshot data`, { error, vdiRef })

package/_runners/_writers/IncrementalXapiWriter.mjs

@@ -19,10 +19,10 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
     // @todo use an index if possible
     // @todo : this seems similare to decorateVmMetadata
 
-    const replicatedVdis = sr.$VDIs
-      .filter(({ other_config }) => {
+    const replicatedVdis = sr.$VDIs 
+      .filter(vdi => {
         // REPLICATED_TO_SR_UUID is not used here since we are already filtering from sr.$VDIs
-        return baseUuidToSrcVdi.has(other_config?.[COPY_OF])
+        return baseUuidToSrcVdi.has(vdi?.other_config[COPY_OF])
       })
       .map(({ other_config }) => other_config?.[COPY_OF])
       .filter(_ => !!_)
@@ -52,10 +52,10 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
     this.cleanup = task.wrapFn(this.cleanup, !hasHealthCheckSr)
     this.healthCheck = task.wrapFn(this.healthCheck, hasHealthCheckSr)
 
-    return task.run(() => this._prepare())
+    return task.run(() => this._prepare(isFull))
   }
 
-  async _prepare() {
+  async _prepare(isFull) {
     const settings = this._settings
     const { uuid: srUuid, $xapi: xapi } = this._sr
     const vmUuid = this._vmUuid
@@ -67,14 +67,19 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
     this._oldEntries = getOldEntries(settings.copyRetention - 1, listReplicatedVms(xapi, scheduleId, srUuid, vmUuid))
 
     if (settings.deleteFirst) {
+      // we want to keep the baseVM when copying a delta
+      // even if we want to keep only one after
+      let mostRecentEntry
+      if (this._oldEntries.length > 1 && settings.copyRetention === 1 && !isFull) {
+        mostRecentEntry = this._oldEntries.pop()
+      }
       await this._deleteOldEntries()
+      this._oldEntries = mostRecentEntry !== undefined ? [mostRecentEntry] : []
     }
   }
 
   async cleanup() {
-    if (!this._settings.deleteFirst) {
-      await this._deleteOldEntries()
-    }
+    await this._deleteOldEntries()
   }
 
   async _deleteOldEntries() {
@@ -98,10 +103,11 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
       .filter(_ => !!_)
     // @todo use index ?
 
-    const replicatedVdis = sr.$VDIs.filter(({ other_config }) => {
-      // REPLICATED_TO_SR_UUID is not used here since we are already filtering from sr.$VDIs
-      return sourceVdiUuids.includes(other_config?.[COPY_OF])
-    })
+    const replicatedVdis = sr.$VDIs
+      .filter(vdi => {
+        // REPLICATED_TO_SR_UUID is not used here since we are already filtering from sr.$VDIs
+        return sourceVdiUuids.includes(vdi?.other_config[COPY_OF])
+      })
 
     Object.values(backup.vdis).forEach(vdi => {
       vdi.other_config[COPY_OF] = vdi.uuid

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.50.0",
+  "version": "0.52.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -46,7 +46,7 @@
     "proper-lockfile": "^4.1.2",
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
-    "vhd-lib": "^4.10.0",
+    "vhd-lib": "^4.11.0",
     "xen-api": "^4.0.0",
     "yazl": "^2.5.1"
   },
@@ -58,7 +58,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^6.1.0"
+    "@xen-orchestra/xapi": "^7.0.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {