@xen-orchestra/backups 0.60.0 → 0.61.0

package/RemoteAdapter.mjs

@@ -34,6 +34,7 @@ import { watchStreamSize } from './_watchStreamSize.mjs'
 import { RemoteVhd } from './disks/RemoteVhd.mjs'
 import { openDiskChain } from './disks/openDiskChain.mjs'
 import { toVhdStream, writeToVhdDirectory } from 'vhd-lib/disk-consumer/index.mjs'
+import { ReadAhead } from '@xen-orchestra/disk-transform'
 
 export const DIR_XO_CONFIG_BACKUPS = 'xo-config-backups'
 
@@ -741,6 +742,7 @@ export class RemoteAdapter {
       disk = new RemoteVhd({ handler, path })
       await disk.init()
     }
+    disk = new ReadAhead(disk)
     return disk
   }
 

package/_runners/_vmRunners/IncrementalRemote.mjs

@@ -9,6 +9,7 @@ import { IncrementalRemoteWriter } from '../_writers/IncrementalRemoteWriter.mjs
 import { Disposable } from 'promise-toolbox'
 import { openVhd } from 'vhd-lib'
 import { getVmBackupDir } from '../../_getVmBackupDir.mjs'
+import { SynchronizedDisk } from '@xen-orchestra/disk-transform'
 
 const { warn } = createLogger('xo:backups:Incrementalremote')
 class IncrementalRemoteVmBackupRunner extends AbstractRemote {
@@ -68,9 +69,12 @@ class IncrementalRemoteVmBackupRunner extends AbstractRemote {
       // recompute if disks are differencing or not
       const isVhdDifferencing = {}
 
-      Object.entries(incrementalExport.disks).forEach(([key, disk]) => {
+      for (const key in incrementalExport.disks) {
+        const disk = incrementalExport.disks[key]
         isVhdDifferencing[key] = disk.isDifferencing()
-      })
+        incrementalExport.disks[key] = new SynchronizedDisk(disk)
+      }
+
       const hasDifferencingDisk = Object.values(isVhdDifferencing).includes(true)
       if (metadata.isBase === hasDifferencingDisk) {
         warn(`Metadata isBase and real disk value are different`, {
@@ -84,10 +88,18 @@ class IncrementalRemoteVmBackupRunner extends AbstractRemote {
       await this._selectBaseVm(metadata)
       await this._callWriters(writer => writer.prepare({ isBase: metadata.isBase }), 'writer.prepare()')
 
+      function fork(incrementalExport, label) {
+        const { disks, ...forked } = incrementalExport
+        forked.disks = {}
+        for (const key in disks) {
+          forked.disks[key] = disks[key].fork(label)
+        }
+        return forked
+      }
       await this._callWriters(
         writer =>
           writer.transfer({
-            deltaExport: incrementalExport,
+            deltaExport: fork(incrementalExport, writer.constructor.name + ' ' + Math.random()),
             isVhdDifferencing,
             timestamp: metadata.timestamp,
             vm: metadata.vm,

package/_runners/_writers/IncrementalRemoteWriter.mjs

@@ -202,8 +202,8 @@ export class IncrementalRemoteWriter extends MixinRemoteWriter(AbstractIncrement
 
     let metadataContent = await this._isAlreadyTransferred(timestamp)
     if (metadataContent !== undefined) {
-      // skip backup while being vigilant to not stuck the forked stream
-      /** @todo destroy fork  */
+      // skip backup while being vigilant to not stuck the forked disk
+      await Promise.all(Object.values(deltaExport.disks).map(async disk => disk.close()))
       return { size: 0 }
     }
 

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.60.0",
+  "version": "0.61.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -29,7 +29,7 @@
     "@vates/nbd-client": "^3.1.3",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/disk-transform": "^1.0.0",
+    "@xen-orchestra/disk-transform": "^1.0.1",
     "@xen-orchestra/fs": "^4.5.1",
     "@xen-orchestra/log": "^0.7.1",
     "@xen-orchestra/template": "^0.1.0",
@@ -50,7 +50,7 @@
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
     "value-matcher": "^0.2.0",
-    "vhd-lib": "^4.11.3",
+    "vhd-lib": "^4.12.0",
     "xen-api": "^4.7.1",
     "yazl": "^2.5.1"
   },