NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Introduced in 249f638495
This commit is contained in:
Florent BEAUCHAMP 2022-01-18 10:07:56 +01:00 committed by GitHub
parent b465a91cd3
commit e15be7ebd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
@xen-orchestra/backups/_cleanVm.js
View File

@ -119,7 +119,7 @@ const listVhds = async (handler, vmDir) => {
const list = await handler.list(vdiDir, { const list = await handler.list(vdiDir, {
filter: file => isVhdFile(file) || INTERRUPTED_VHDS_REG.test(file), 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 => { list.forEach(file => {
const res = INTERRUPTED_VHDS_REG.exec(file) const res = INTERRUPTED_VHDS_REG.exec(file)
if (res === null) { 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 alias are correct
// check if all vhd in data subfolder have a corresponding alias // check if all vhd in data subfolder have a corresponding alias
// await asyncMap(Object.keys(aliases), async dir => { await asyncMap(Object.keys(aliases), async dir => {
// await checkAliases(aliases[dir], `${dir}/data`, { handler, onLog, remove }) await checkAliases(aliases[dir], `${dir}/data`, { handler, onLog, remove })
// }) })
// Avoid a ESLint unused variable
noop(aliases)
// remove VHDs with missing ancestors // remove VHDs with missing ancestors
{ {

3
packages/vhd-lib/index.js
View File

@ -12,3 +12,6 @@ exports.VhdDirectory = require('./Vhd/VhdDirectory').VhdDirectory
exports.VhdFile = require('./Vhd/VhdFile').VhdFile exports.VhdFile = require('./Vhd/VhdFile').VhdFile
exports.VhdSynthetic = require('./Vhd/VhdSynthetic').VhdSynthetic exports.VhdSynthetic = require('./Vhd/VhdSynthetic').VhdSynthetic
exports.Constants = require('./_constants') exports.Constants = require('./_constants')
const {isVhdAlias, resolveAlias} = require('./_resolveAlias')
exports.isVhdAlias = isVhdAlias
exports.resolveAlias = resolveAlias