feat(xo-web/Backup NG/logs): display whether the export is delta/full (…

…#3023) See #2711
vatesfr · Jun 7, 2018 · a81f0b9 · a81f0b9
1 parent 2cee413
commit a81f0b9
Show file tree

Hide file tree

Showing 4 changed files with 225 additions and 201 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Create new VDI from SR view not attached to any VM [#2229](https://github.com/vatesfr/xen-orchestra/issues/2229)
 - [Patches] ignore XS upgrade in missing patches counter [#2866](https://github.com/vatesfr/xen-orchestra/issues/2866)
 - [Health] List VM snapshots related to non-existing backup jobs/schedules [#2828](https://github.com/vatesfr/xen-orchestra/issues/2828)
+- [Delta Backup NG logs] Display wether the export is a full or a delta [#2711](https://github.com/vatesfr/xen-orchestra/issues/2711)
 
 ### Bugs
 

diff --git a/packages/xo-server/src/xo-mixins/backups-ng/index.js b/packages/xo-server/src/xo-mixins/backups-ng/index.js
@@ -1018,12 +1018,16 @@ export default class BackupNg {
               }
             })()
 
+      const isFull = some(
+        deltaExport.vdis,
+        vdi => vdi.other_config['xo:base_delta'] === undefined
+      )
       await waitAll(
         [
           ...remotes.map(
             wrapTaskFn(
               id => ({
-                data: { id, type: 'remote' },
+                data: { id, isFull, type: 'remote' },
                 logger,
                 message: 'export',
                 parentId: taskId,
@@ -1119,7 +1123,7 @@ export default class BackupNg {
           ...srs.map(
             wrapTaskFn(
               id => ({
-                data: { id, type: 'SR' },
+                data: { id, isFull, type: 'SR' },
                 logger,
                 message: 'export',
                 parentId: taskId,

diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
@@ -261,6 +261,7 @@ const messages = {
   jobTransferredDataSpeed: 'Transfer speed:',
   operationSize: 'Size',
   operationSpeed: 'Speed',
+  exportType: 'Type',
   jobMergedDataSize: 'Merge size:',
   jobMergedDataSpeed: 'Merge speed:',
   allJobCalls: 'All',