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

Various changes.

Browse Source
This commit is contained in:
Julien Fontanet 2016-01-17 10:36:47 +01:00
parent 98899ece72
commit 3c054e6ea1
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xapi.js
View File

@ -1219,7 +1219,7 @@ export default class Xapi extends XapiBase {
const vm = await this.snapshotVm(vmId)
$onFailure(() => this._deleteVm(vm, true))
const baseVm = baseVmId && this.getObject(baseVmId, null)
const baseVm = baseVmId && this.getObject(baseVmId)
const baseVdis = {}
baseVm && forEach(baseVm.$VBDs, vbd => {
@ -1261,7 +1261,7 @@ export default class Xapi extends XapiBase {
...vdi,
other_config: {
...vdi.other_config,
[TAG_BASE_DELTA]: baseVdi.$id
[TAG_BASE_DELTA]: baseVdi.uuid
}
}
: vdi

15
src/xo-mixins/backups.js
View File

@ -127,8 +127,13 @@ export default class {
targetSr = targetXapi.getObject(targetSr._xapiId)
// 1. Find the local base for this SR (if any).
const tag = `xo:base_delta:${targetSr.uuid}`
const localBaseId = srcVm.other_config[tag]
const TAG_LAST_BASE_DELTA = `xo:base_delta:${targetSr.uuid}`
const localBaseUuid = (id => {
if (id != null) {
const base = srcXapi.getObject(id, null)
return base && base.uuid
}
})(srcVm.other_config[TAG_LAST_BASE_DELTA])
// 2. Copy.
const dstVm = await (async () => {
@ -152,14 +157,14 @@ export default class {
// Once done, (asynchronously) remove the (now obsolete) local
// base.
if (localBaseId) {
promise.then(() => srcXapi.deleteVm(localBaseId, true)).catch(noop)
if (localBaseUuid) {
promise.then(() => srcXapi.deleteVm(localBaseUuid, true)).catch(noop)
}
// (Asynchronously) Identify snapshot as future base.
promise.then(() => {
return srcXapi._updateObjectMapProperty(srcVm, 'other_config', {
[tag]: delta.vm.uuid
[TAG_LAST_BASE_DELTA]: delta.vm.uuid
})
}).catch(noop)