@xen-orchestra/backups 0.50.0 → 0.51.0

package/_runners/_vmRunners/_AbstractXapi.mjs

@@ -146,18 +146,9 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
         if (!settings.bypassVdiChainsCheck) {
           await vm.$assertHealthyVdiChains()
         }
-        if (settings.preferNbd) {
-          try {
-            // enable CBT on all disks if possible
-            const diskRefs = await xapi.VM_getDisks(vm.$ref)
-            await Promise.all(diskRefs.map(diskRef => xapi.call('VDI.enable_cbt', diskRef)))
-          } catch (error) {
-            Task.info(`couldn't enable CBT`, error)
-          }
-        }
 
         const snapshotRef = await vm[settings.checkpointSnapshot ? '$checkpoint' : '$snapshot']({
-          ignoreNobakVdis: true,
+          ignoredVdisTag: '[NOBAK]',
           name_label: this._getSnapshotNameLabel(vm),
           unplugVusbs: true,
         })
@@ -169,6 +160,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
           vmUuid: vm.uuid,
         })
         this._exportedVm = await xapi.getRecord('VM', snapshotRef)
+
         return this._exportedVm.uuid
       })
     } else {
@@ -216,7 +208,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
 
     const snapshotsPerSchedule = groupBy(this._jobSnapshotVdis, _ => _.other_config[SCHEDULE_ID])
     const xapi = this._xapi
-    await asyncMap(Object.entries(snapshotsPerSchedule), async ([scheduleId, snapshots]) => {
+    await asyncMap(Object.entries(snapshotsPerSchedule), ([scheduleId, snapshots]) => {
       const snapshotPerDatetime = groupBy(snapshots, _ => _.other_config[DATETIME])
 
       const datetimes = Object.keys(snapshotPerDatetime)
@@ -230,7 +222,7 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
       // ensure we never delete the last one
       const retention = Math.max(settings.snapshotRetention ?? 0, 1)
 
-      await asyncMap(getOldEntries(retention, datetimes), async datetime => {
+      return asyncMap(getOldEntries(retention, datetimes), async datetime => {
         const vdis = snapshotPerDatetime[datetime]
 
         let vmRef
@@ -242,8 +234,8 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
             // this will throw error for VDI still attached to control domain
             assert.strictEqual(vbds.length, 1, 'VDI must be free or attached to exactly one VM')
             const vm = vbds[0].$VM
-            assert.strictEqual(vm.is_control_domain, false, `Disk is still attached to DOM0 VM`) // don't delete a VM (especially a control domain)
             assert.strictEqual(vm.is_a_snapshot, true, `VM must be a snapshot`) // don't delete a VM (especially a control domain)
+            assert.strictEqual(vm.is_control_domain, false, `VM can't be a DOM0 VM`) // don't delete a VM (especially a control domain)
 
             const vmRefVdi = vm.$ref
             // same vm than other vdi of the same batch
@@ -265,33 +257,6 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
         }
       })
     })
-
-    // now that we use CBT, we can destroy the data of the snapshot used for this backup
-    // going back to a previous version of XO not supporting CBT will create a full backup
-    // this will only do something after snapshot and transfer
-    if (
-      // don't modify the VM
-      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
-      this._settings.preferNbd &&
-      // only delete snapshost data if the config allows it
-      this.config.purgeSnapshotData
-    ) {
-      Task.info('will delete snapshot data')
-      const vdiRefs = await this._xapi.VM_getDisks(this._exportedVm?.$ref)
-      await xapi.call('VM.destroy', this._exportedVm.$ref)
-      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)
-          Task.info(`Snapshot data has been deleted`, { vdiRef })
-        } catch (error) {
-          Task.warning(`Couldn't deleted snapshot data`, { error, vdiRef })
-        }
-      }
-    }
   }
 
   async copy() {

package/_runners/_writers/IncrementalXapiWriter.mjs

@@ -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() {

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.50.0",
+  "version": "0.51.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -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": {