add recusrive fn to compute backup instead code duplication

vatesfr · Sep 12, 2024 · 25fe0c7 · 25fe0c7
1 parent bcad776
commit 25fe0c7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/@xen-orchestra/backups/RemoteAdapter.mjs b/@xen-orchestra/backups/RemoteAdapter.mjs
@@ -828,15 +828,26 @@ export class RemoteAdapter {
     return metadata
   }
 
+  #computeTotalBackupSizeRecursively(backups) {
+    return reduce(
+      backups,
+      (prev, backup) => {
+        const _backup = Array.isArray(backup) ? this.#computeTotalBackupSizeRecursively(backup) : backup
+        return {
+          onDisk: prev.onDisk + (_backup.onDisk ?? _backup.size),
+        }
+      },
+      { onDisk: 0 }
+    )
+  }
+
   async getTotalVmBackupSize() {
-    const vmBackups = await this.listAllVmBackups()
-    return reduce(vmBackups, (sum, backups) => sum + backups.reduce((sum, backup) => sum + backup.size, 0), 0)
+    return this.#computeTotalBackupSizeRecursively(await this.listAllVmBackups())
   }
 
   // @TODO: add `getTotalXoBackupSize` and `getTotalPoolBackupSize` once `size` is implemented
   async getTotalBackupSize() {
-    const backupsSize = await Promise.all([this.getTotalVmBackupSize()])
-    return backupsSize.reduce((sum, backupSize) => sum + backupSize)
+    return this.#computeTotalBackupSizeRecursively(await Promise.all([this.getTotalVmBackupSize()]))
   }
 }
 

diff --git a/packages/xo-server/src/xo-mixins/remotes.mjs b/packages/xo-server/src/xo-mixins/remotes.mjs
@@ -174,7 +174,7 @@ export default class {
             })
           : this.getRemoteHandler(remote.id).then(handler => handler.getInfo())
 
-      const sizeUsedForBackups = await Disposable.use(this._app.getBackupsRemoteAdapter(remote), adapter =>
+      const totalBackupSize = await Disposable.use(this._app.getBackupsRemoteAdapter(remote), adapter =>
         adapter.getTotalBackupSize()
       ).catch(noop)
 
@@ -183,7 +183,7 @@ export default class {
           promise.then(info => {
             remotesInfo[remote.id] = {
               ...info,
-              sizeUsedForBackups,
+              totalBackupSize,
               encryption,
             }
           }),

diff --git a/packages/xo-server/src/xo-mixins/rest-api.mjs b/packages/xo-server/src/xo-mixins/rest-api.mjs
@@ -240,14 +240,15 @@ async function _getDashboardStats(app) {
         continue
       }
 
-      const { available, size, sizeUsedForBackups = 0, used } = backupRepositoryInfo
+      const { available, size, totalBackupSize, used } = backupRepositoryInfo
+
       const isS3 = type === 's3'
       const target = isS3 ? s3Brsize : otherBrSize
 
-      target.backups += sizeUsedForBackups
+      target.backups += totalBackupSize?.onDisk ?? 0
       if (!isS3) {
         target.available += available
-        target.other += used - sizeUsedForBackups
+        target.other += used - (totalBackupSize?.onDisk ?? 0)
         target.total += size
         target.used += used
       }