From 7bb73bee6764da56bee15c10b569aa773b7fcbf8 Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Mon, 5 Sep 2016 11:24:41 +0200 Subject: [PATCH] feat(vm.rollingDrCopy): failure to destroy old copies is not fatal --- src/xo-mixins/backups.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/xo-mixins/backups.js b/src/xo-mixins/backups.js index 5b5f2a06c..a5bf255fb 100644 --- a/src/xo-mixins/backups.js +++ b/src/xo-mixins/backups.js @@ -706,11 +706,9 @@ export default class { }) await targetXapi.addTag(drCopy.$id, 'Disaster Recovery') - const promises = [] - for (let surplus = olderCopies.length - (depth - 1); surplus > 0; surplus--) { - const oldDRVm = olderCopies.shift() - promises.push(targetXapi.deleteVm(oldDRVm.$id, true)) - } - await Promise.all(promises) + await Promise.all(mapToArray(olderCopies.slice(0, -depth), vm => + // Do not consider a failure to delete an old copy as a fatal error. + targetXapi.deleteVm(vm.$id)::pCatch(noop) + )) } }