fix(@xen-orchestra/backups): clean VM immediatly after selecting back…

…up to be deleted

@xen-orchestra/backups/RemoteAdapter.js

@@ -230,8 +230,8 @@ class RemoteAdapter {
   async deleteDeltaVmBackups(backups) {
     const handler = this._handler
 
-    // unused VHDs will be detected by `cleanVm`
-    await asyncMapSettled(backups, ({ _filename }) => VhdAbstract.unlink(handler, _filename))
+    // this will delete the json, unused VHDs will be detected by `cleanVm`
+    await asyncMapSettled(backups, ({ _filename }) => handler.unlink(_filename))
   }
 
   async deleteMetadataBackup(backupId) {
@@ -277,6 +277,11 @@ class RemoteAdapter {
       delta !== undefined && this.deleteDeltaVmBackups(delta),
       full !== undefined && this.deleteFullVmBackups(full),
     ])
+
+    const dirs = new Set(files.map(file => dirname(file)))
+    for(const dir of dirs){
+      await this.cleanVm(dir, {remove: true, onLog: warn })
+    }
   }
 
   #getCompressionType() {

CHANGELOG.unreleased.md

@@ -13,6 +13,7 @@
 ### Bug fixes
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
+- [Backup] : delete backups immediatly after selecting them instead of waiting for the next backup successfull execution (PR [#6081](https://github.com/vatesfr/xen-orchestra/pull/6081))
 
 ### Packages to release
 

packages/xo-web/src/common/xo/index.js

@@ -2221,13 +2221,7 @@ export const restoreBackup = (backup, sr, { generateNewMacAddresses = false, sta
 
 export const deleteBackup = backup => _call('backupNg.deleteVmBackup', { id: resolveId(backup) })
 
-export const deleteBackups = async backups => {
-  // delete sequentially from newest to oldest
-  backups = backups.slice().sort((b1, b2) => b2.timestamp - b1.timestamp)
-  for (let i = 0, n = backups.length; i < n; ++i) {
-    await deleteBackup(backups[i])
-  }
-}
+export const deleteBackups = async backups => _call('backupNg.deleteVmBackups', { ids: backups.map(backup => resolveId(backup)) })
 
 export const createMetadataBackupJob = props =>
   _call('metadataBackup.createJob', props)