feat(vhd-lib): handle broken vhd directory named as aliases (#8292)

@xen-orchestra/backups/_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
     }

CHANGELOG.unreleased.md

@@ -36,6 +36,7 @@
 
 - @xen-orchestra/backups patch
 - @xen-orchestra/web minor
+- vhd-lib patch
 - xo-server patch
 
 <!--packages-end-->

packages/vhd-lib/Vhd/VhdAbstract.js

@@ -19,9 +19,11 @@ const {
 const assert = require('assert')
 const path = require('path')
 const asyncIteratorToStream = require('async-iterator-to-stream')
+const { createLogger } = require('@xen-orchestra/log')
 const { checksumStruct, fuFooter, fuHeader } = require('../_structs')
 const { isVhdAlias, resolveVhdAlias } = require('../aliases')
 
+const { warn } = createLogger('vhd-lib:VhdAbstract')
 exports.VhdAbstract = class VhdAbstract {
   get bitmapSize() {
     return sectorsToBytes(this.sectorsOfBitmap)
@@ -202,7 +204,16 @@ exports.VhdAbstract = class VhdAbstract {
   }
 
   static async unlink(handler, path) {
-    const resolved = await resolveVhdAlias(handler, path)
+    let resolved = path
+    try {
+      resolved = await resolveVhdAlias(handler, path)
+    } catch (err) {
+      // broken vhd directory must be unlinkable
+      if (err.code !== 'EISDIR') {
+        throw err
+      }
+      warn('Deleting directly a VhdDirectory', { path, err })
+    }
     try {
       await handler.unlink(resolved)
     } catch (err) {