@xen-orchestra/backups 0.61.1 → 0.62.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/_AbstractXapi.mjs

@@ -146,9 +146,9 @@ export const AbstractXapi = class AbstractXapiVmBackupRunner extends Abstract {
         if (!settings.bypassVdiChainsCheck) {
           await vm.$assertHealthyVdiChains()
         }
-        if (settings.preferNbd) {
+        if (settings.cbtDestroySnapshotData) {
           try {
-            // enable CBT on all disks if possible
+            // enable CBT on all disks if we want to be able to purge snapshot data
             const diskRefs = await xapi.VM_getDisks(vm.$ref)
             await Promise.all(diskRefs.map(diskRef => xapi.callAsync('VDI.enable_cbt', diskRef)))
           } catch (error) {

package/disks/RemoteVhd.mjs

@@ -94,13 +94,7 @@ export class RemoteVhd extends RandomAccessDisk {
    * @returns {Promise<void>}
    */
   async close() {
-    try {
-      await this.#dispose()
-    } catch (err) {
-      if (err.code !== 'EBADF') {
-        throw err // handle double dispose
-      }
-    }
+    await this.#dispose()
   }
 
   /**

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.61.1",
+  "version": "0.62.0",
   "engines": {
     "node": ">=14.18"
   },
@@ -29,9 +29,10 @@
     "@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.1",
-    "@xen-orchestra/fs": "^4.5.1",
+    "@xen-orchestra/disk-transform": "^1.1.0",
+    "@xen-orchestra/fs": "^4.6.0",
     "@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.12.0",
-    "xen-api": "^4.7.1",
+    "vhd-lib": "^4.14.0",
+    "xen-api": "^4.7.2",
     "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.0"
   },
   "license": "AGPL-3.0-or-later",
   "author": {