NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xo-server/{CR,DR}): add tags at VM creation (#5341)

Browse Source 
Fixes https://xcp-ng.org/forum/topic/3285/cr-tag-ignored-kind-of-in-smart-backup

Necessary to avoid smart mode from matching the replicated VMs currently being imported.
This commit is contained in:
Julien Fontanet
2020-10-29 17:27:04 +01:00
committed by GitHub
parent c2777607be
commit 8dcff63aea
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/xo-server/src/xo-mixins/backups-ng/index.js
View File

@@ -1549,17 +1549,19 @@ export default class BackupNg {
result: () => ({ size: xva.size }),
},
xapi._importVm($cancelToken, fork, sr, vm =>
vm.set_name_label(
`${metadata.vm.name_label} - ${
job.name
} - (${safeDateFormat(metadata.timestamp)})`
)
Promise.all([
vm.add_tags('Disaster Recovery'),
vm.set_name_label(
`${metadata.vm.name_label} - ${
job.name
} - (${safeDateFormat(metadata.timestamp)})`
),
])
)
)
)
await Promise.all([
vm.add_tags('Disaster Recovery'),
disableVmHighAvailability(xapi, vm),
vm.update_blocked_operations(
'start',
@@ -1936,17 +1938,25 @@ export default class BackupNg {
parentId: taskId,
result: ({ transferSize }) => ({ size: transferSize }),
},
xapi.importDeltaVm(fork, {
disableStartAfterImport: false, // we'll take care of that
name_label: `${metadata.vm.name_label} - ${
job.name
} - (${safeDateFormat(metadata.timestamp)})`,
srId: sr.$id,
})
xapi.importDeltaVm(
{
__proto__: fork,
vm: {
...fork.vm,
tags: [...fork.vm.tags, 'Continuous Replication'],
},
},
{
disableStartAfterImport: false, // we'll take care of that
name_label: `${metadata.vm.name_label} - ${
job.name
} - (${safeDateFormat(metadata.timestamp)})`,
srId: sr.$id,
}
)
)
await Promise.all([
vm.add_tags('Continuous Replication'),
disableVmHighAvailability(xapi, vm),
vm.update_blocked_operations(
'start',