@xen-orchestra/backups 0.58.2 → 0.58.4

package/ImportVmBackup.mjs

@@ -257,7 +257,14 @@ export class ImportVmBackup {
           : await importIncrementalVm(backup, await xapi.getRecord('SR', srRef), {
               newMacAddresses,
             })
-
+        const remoteName = adapter._handler._remote.name
+        let desc = `Restored on ${formatFilenameDate(+new Date())}`
+        if (remoteName !== undefined) {
+          desc += ` from ${remoteName}`
+        }
+        if (metadata.vm.name_description) {
+          desc += ` - ${metadata.vm.name_description}`
+        }
         await Promise.all([
           xapi.call('VM.add_tags', vmRef, 'restored from backup'),
           xapi.call(
@@ -265,13 +272,7 @@ export class ImportVmBackup {
             vmRef,
             `${metadata.vm.name_label} (${formatFilenameDate(metadata.timestamp)})`
           ),
-          xapi.call(
-            'VM.set_name_description',
-            vmRef,
-            `Restored on ${formatFilenameDate(+new Date())} from ${adapter._handler._remote.name} -
-             ${metadata.vm.name_description}
-            `
-          ),
+          xapi.call('VM.set_name_description', vmRef, desc),
         ])
 
         return {

package/_cleanVm.mjs

@@ -129,9 +129,27 @@ export async function checkAliases(
         logWarn('missing target of alias', { alias })
         if (remove) {
           logInfo('removing alias and non VHD target', { alias, target })
-          await handler.unlink(target)
           await handler.unlink(alias)
         }
+        continue
+      }
+      if (err.code === 'EISDIR') {
+        logWarn('alias is a vhd directory', { alias })
+        if (remove) {
+          logInfo('removing vhd directory named as alias', { alias, target })
+          await VhdAbstract.unlink(handler, alias)
+        }
+        continue
+      }
+      logWarn('unhandled error while checking alias', { alias, err })
+      continue
+    }
+
+    if (target === '') {
+      logWarn('empty target for alias ', { alias })
+      if (remove) {
+        logInfo('removing alias and non VHD target', { alias, target })
+        await handler.unlink(alias)
       }
       continue
     }

package/_runners/_writers/IncrementalXapiWriter.mjs

@@ -11,7 +11,6 @@ import { MixinXapiWriter } from './_MixinXapiWriter.mjs'
 import { listReplicatedVms } from './_listReplicatedVms.mjs'
 import { COPY_OF, setVmOtherConfig, BASE_DELTA_VDI } from '../../_otherConfig.mjs'
 
-import assert from 'node:assert'
 export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWriter) {
   async checkBaseVdis(baseUuidToSrcVdi) {
     const sr = this._sr
@@ -118,9 +117,10 @@ export class IncrementalXapiWriter extends MixinXapiWriter(AbstractIncrementalWr
         const baseReplicatedTo = replicatedVdis.find(
           replicatedVdi => replicatedVdi.other_config[COPY_OF] === vdi.other_config[BASE_DELTA_VDI]
         )
-        assert.notStrictEqual(baseReplicatedTo, undefined)
+        // baseReplicatedTo can be undefined if a new disk is added and other are already replicated
         vdi.baseVdi = baseReplicatedTo
       } else {
+        // first replication of this disk
         vdi.baseVdi = undefined
       }
       // ensure the VDI are created on the target SR

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/vatesfr/xen-orchestra.git"
   },
-  "version": "0.58.2",
+  "version": "0.58.4",
   "engines": {
     "node": ">=14.18"
   },
@@ -28,7 +28,7 @@
     "@vates/nbd-client": "^3.1.2",
     "@vates/parse-duration": "^0.1.1",
     "@xen-orchestra/async-map": "^0.1.2",
-    "@xen-orchestra/fs": "^4.4.0",
+    "@xen-orchestra/fs": "^4.4.1",
     "@xen-orchestra/log": "^0.7.1",
     "@xen-orchestra/template": "^0.1.0",
     "app-conf": "^3.0.0",
@@ -48,8 +48,8 @@
     "tar": "^6.1.15",
     "uuid": "^9.0.0",
     "value-matcher": "^0.2.0",
-    "vhd-lib": "^4.11.2",
-    "xen-api": "^4.7.0",
+    "vhd-lib": "^4.11.3",
+    "xen-api": "^4.7.1",
     "yazl": "^2.5.1"
   },
   "devDependencies": {
@@ -59,7 +59,7 @@
     "tmp": "^0.2.1"
   },
   "peerDependencies": {
-    "@xen-orchestra/xapi": "^8.0.0"
+    "@xen-orchestra/xapi": "^8.1.1"
   },
   "license": "AGPL-3.0-or-later",
   "author": {