fix(backups/_cleanVm): fixes for aliases cleaning (#6094)

Introduced in 249f638
vatesfr · Jan 18, 2022 · e15be7e · e15be7e
1 parent b465a91
commit e15be7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/@xen-orchestra/backups/_cleanVm.js b/@xen-orchestra/backups/_cleanVm.js
@@ -119,7 +119,7 @@ const listVhds = async (handler, vmDir) => {
           const list = await handler.list(vdiDir, {
             filter: file => isVhdFile(file) || INTERRUPTED_VHDS_REG.test(file),
           })
-          aliases[vdiDir] = list.filter(vhd => isVhdAlias(vhd))
+          aliases[vdiDir] = list.filter(vhd => isVhdAlias(vhd)).map(file => `${vdiDir}/${file}`)
           list.forEach(file => {
             const res = INTERRUPTED_VHDS_REG.exec(file)
             if (res === null) {
@@ -249,15 +249,11 @@ exports.cleanVm = async function cleanVm(
     }
   }
 
-  // 2022-01-17 - FBP & JFT - Temporary disable aliases checking as it appears problematic
-  //
   // check if alias are correct
   // check if all vhd in data subfolder have a corresponding alias
-  // await asyncMap(Object.keys(aliases), async dir => {
-  //   await checkAliases(aliases[dir], `${dir}/data`, { handler, onLog, remove })
-  // })
-  // Avoid a ESLint unused variable
-  noop(aliases)
+  await asyncMap(Object.keys(aliases), async dir => {
+    await checkAliases(aliases[dir], `${dir}/data`, { handler, onLog, remove })
+  })
 
   // remove VHDs with missing ancestors
   {

diff --git a/packages/vhd-lib/index.js b/packages/vhd-lib/index.js
@@ -12,3 +12,6 @@ exports.VhdDirectory = require('./Vhd/VhdDirectory').VhdDirectory
 exports.VhdFile = require('./Vhd/VhdFile').VhdFile
 exports.VhdSynthetic = require('./Vhd/VhdSynthetic').VhdSynthetic
 exports.Constants = require('./_constants')
+const {isVhdAlias, resolveAlias} = require('./_resolveAlias')
+exports.isVhdAlias = isVhdAlias
+exports.resolveAlias = resolveAlias