fix(backups/deleteVmBackups): don't fail on cleanVm error

Seen when investigating zammad#8842
This commit is contained in:
Julien Fontanet 2022-09-12 11:19:13 +02:00
parent 5dc993255c
commit 4350f0cd1a
2 changed files with 6 additions and 2 deletions

View File

@ -300,8 +300,11 @@ class RemoteAdapter {
const dirs = new Set(files.map(file => dirname(file)))
for (const dir of dirs) {
// don't merge in main process, unused VHDs will be merged in the next backup run
await this.cleanVm(dir, { remove: true, logWarn: warn })
// - don't merge in main process, unused VHDs will be merged in the next backup run
// - don't error in case this fails:
// - if lock is already being held, a backup is running and cleanVm will be ran at the end
// - otherwise, there is nothing more we can do, orphan file will be cleaned in the future
await this.cleanVm(dir, { remove: true, logWarn: warn }).catch(noop)
}
}

View File

@ -15,6 +15,7 @@
- [Plugin/auth-saml] Certificate input support multiline (PR [#6403](https://github.com/vatesfr/xen-orchestra/pull/6403))
- [Backup] Launch Health Check after a full backup (PR [#6401](https://github.com/vatesfr/xen-orchestra/pull/6401))
- [Backup] Fix `Lock file is already being held` error when deleting a VM backup while the VM is currently being backed up
### Packages to release