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

fix(xo-server/backups-ng): delete unused snapshot on delta failure

Browse Source
This commit is contained in:
Julien Fontanet 2018-03-29 10:48:57 +02:00
parent cf11ed0830
commit 20d3faa306
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/xo-server/src/xo-mixins/backups-ng/index.js
View File

@ -562,7 +562,6 @@ export default class BackupNg {
// 2. next run should be a full // 2. next run should be a full
// - [ ] add a lock on the job/VDI during merge which should prevent other merges and restoration // - [ ] add a lock on the job/VDI during merge which should prevent other merges and restoration
// - [ ] import for delta // - [ ] import for delta
// - [ ] do not delete rolling snapshot in case of failure!
// //
// Low: // Low:
// - [ ] check merge/transfert duration/size are what we want for delta // - [ ] check merge/transfert duration/size are what we want for delta
@ -591,6 +590,7 @@ export default class BackupNg {
// - [x] backups should be deletable from the API // - [x] backups should be deletable from the API
// - [x] adding and removing VDIs should behave // - [x] adding and removing VDIs should behave
// - [x] isolate VHD chains by job // - [x] isolate VHD chains by job
// - [x] do not delete rolling snapshot in case of failure!
@defer @defer
async _backupVm ( async _backupVm (
$defer: any, $defer: any,
@ -793,6 +793,11 @@ export default class BackupNg {
transferSize: xva.size, transferSize: xva.size,
} }
} else if (job.mode === 'delta') { } else if (job.mode === 'delta') {
if (snapshotRetention === 0) {
// only keep the snapshot in case of success
$defer.onFailure.call(xapi, 'deleteVm', snapshot)
}
const baseSnapshot = last(snapshots) const baseSnapshot = last(snapshots)
if (baseSnapshot !== undefined) { if (baseSnapshot !== undefined) {
console.log(baseSnapshot.$id) // TODO: remove console.log(baseSnapshot.$id) // TODO: remove