Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(xo-web/Backup NG/logs): display the export type #3023

Merged
merged 7 commits into from
Jun 7, 2018
Merged

feat(xo-web/Backup NG/logs): display the export type #3023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
04d3ccf
[WiP] feat(xo-web/Backup NG/logs): display the export mode
badrAZ Jun 4, 2018
53367d7
fix errors
badrAZ Jun 6, 2018
00c79aa
code improvement
badrAZ Jun 7, 2018
0aeb6c2
fix error
badrAZ Jun 7, 2018
5e4e4bf
update the CHANGELOG
badrAZ Jun 7, 2018
68a3291
Fix error
badrAZ Jun 7, 2018
b34c12d
Update CHANGELOG.md
julien-f Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 6 additions & 2 deletions packages/xo-server/src/xo-mixins/backups-ng/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions packages/xo-web/src/common/intl/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ const messages = {
jobTransferredDataSpeed: 'Transfer speed:',
operationSize: 'Size',
operationSpeed: 'Speed',
exportType: 'Type',
jobMergedDataSize: 'Merge size:',
jobMergedDataSpeed: 'Merge speed:',
allJobCalls: 'All',
Expand Down