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

chore(xo-server/xapi#exportVm): minor code improvement

Browse Source
This commit is contained in:
Julien Fontanet 2018-10-04 17:56:37 +02:00 committed by Pierre Donias
parent 72a4179c03
commit 90de47d708
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/xo-server/src/xapi/index.js
View File

@ -743,33 +743,28 @@ export default class Xapi extends XapiBase {
@cancelable
async exportVm ($cancelToken, vmId, { compress = true } = {}) {
const vm = this.getObject(vmId)
let snapshotRef
if (isVmRunning(vm)) {
snapshotRef = (await this._snapshotVm(
$cancelToken,
vm,
`[XO Export] ${vm.name_label}`
)).$ref
}
const useSnapshot = isVmRunning(vm)
const exportedVm = useSnapshot
? await this._snapshotVm($cancelToken, vm, `[XO Export] ${vm.name_label}`)
: vm
const promise = this.getResource($cancelToken, '/export/', {
query: {
ref: snapshotRef || vm.$ref,
ref: exportedVm.$ref,
use_compression: compress ? 'true' : 'false',
},
task: this.createTask('VM export', vm.name_label),
}).catch(error => {
// augment the error with as much relevant info as possible
error.pool_master = this.pool.$master
error.VM = snapshotRef || vm
error.VM = exportedVm
throw error
})
if (snapshotRef !== undefined) {
if (useSnapshot) {
promise.then(_ =>
_.task::pFinally(() => this.deleteVm(snapshotRef)::ignoreErrors())
_.task::pFinally(() => this.deleteVm(exportedVm)::ignoreErrors())
)
}