fix(backups/healtchcheck): healthcheck must be run in task for mirror

the afterBackup writer function mark the task as done, healthceck should run inside the run
vatesfr · Mar 19, 2024 · 7d5da91 · 7d5da91
1 parent e52b18f
commit 7d5da91
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/@xen-orchestra/backups/_runners/_vmRunners/FullRemote.mjs b/@xen-orchestra/backups/_runners/_vmRunners/FullRemote.mjs
@@ -41,6 +41,7 @@ export const FullRemote = class FullRemoteVmBackupRunner extends AbstractRemote
         // for healthcheck
         this._tags = metadata.vm.tags
       }
+      await this._healthCheck()
     } else {
       Task.info('No new data to upload for this VM')
     }

diff --git a/@xen-orchestra/backups/_runners/_vmRunners/IncrementalRemote.mjs b/@xen-orchestra/backups/_runners/_vmRunners/IncrementalRemote.mjs
@@ -103,6 +103,7 @@ class IncrementalRemoteVmBackupRunner extends AbstractRemote {
         // for healthcheck
         this._tags = metadata.vm.tags
       }
+      await this._healthCheck()
     } else {
       Task.info('No new data to upload for this VM')
     }

diff --git a/@xen-orchestra/backups/_runners/_vmRunners/_AbstractRemote.mjs b/@xen-orchestra/backups/_runners/_vmRunners/_AbstractRemote.mjs
@@ -94,7 +94,6 @@ export const AbstractRemote = class AbstractRemoteVmBackupRunner extends Abstrac
     const handler = this._sourceRemoteAdapter._handler
     await Disposable.use(await handler.lock(getVmBackupDir(this._vmUuid)), async () => {
       await this._run()
-      await this._healthCheck()
     })
   }
 }
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -22,6 +22,7 @@
 - [VM/Migration] SR is no longer required if you select a migration network (PR [#7360](https://github.com/vatesfr/xen-orchestra/pull/7360))
 - [Backup] Fix `an error has occurred` when clicking on warning text in logs (PR [#7458](https://github.com/vatesfr/xen-orchestra/pull/7458))
 - [JSON-RPC API] Correctly require one-time password if configured for user (PR [#7459](https://github.com/vatesfr/xen-orchestra/pull/7459))
+- [Backup] Fix `task has already ended` when running a health check in a mirror backup (PR [#7467](https://github.com/vatesfr/xen-orchestra/pull/7467))
 
 ### Packages to release