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

feat(xapi): no longer use promise-toolbox/cancelable

Browse Source
This commit is contained in:
Julien Fontanet 2021-03-24 15:34:47 +01:00
parent e6667c1782
commit 20e7a036cf
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
@xen-orchestra/backups/_VmBackup.js
View File

@ -121,9 +121,9 @@ exports.VmBackup = class VmBackup {
await vm.$assertHealthyVdiChains() await vm.$assertHealthyVdiChains()
} }
const snapshotRef = await vm[settings.checkpointSnapshot ? '$checkpoint' : '$snapshot']( const snapshotRef = await vm[settings.checkpointSnapshot ? '$checkpoint' : '$snapshot']({
this._getSnapshotNameLabel(vm) name_label: this._getSnapshotNameLabel(vm),
) })
this.timestamp = Date.now() this.timestamp = Date.now()
await xapi.setFieldEntries('VM', snapshotRef, 'other_config', { await xapi.setFieldEntries('VM', snapshotRef, 'other_config', {

31
@xen-orchestra/xapi/src/vm.js
View File

@ -1,4 +1,4 @@
const cancelable = require('promise-toolbox/cancelable') const CancelToken = require('promise-toolbox/CancelToken')
const defer = require('golike-defer').default const defer = require('golike-defer').default
const groupBy = require('lodash/groupBy') const groupBy = require('lodash/groupBy')
const pickBy = require('lodash/pickBy') const pickBy = require('lodash/pickBy')
@ -124,16 +124,15 @@ module.exports = class Vm {
} }
} }
@cancelable async checkpoint(vmRef, { cancelToken = CancelToken.none, name_label } = {}) {
async checkpoint($cancelToken, vmRef, nameLabel) { if (name_label === undefined) {
if (nameLabel === undefined) { name_label = await this.getField('VM', vmRef, 'name_label')
nameLabel = await this.getField('VM', vmRef, 'name_label')
} }
try { try {
return await this.callAsync($cancelToken, 'VM.checkpoint', vmRef, nameLabel).then(extractOpaqueRef) return await this.callAsync(cancelToken, 'VM.checkpoint', vmRef, name_label).then(extractOpaqueRef)
} catch (error) { } catch (error) {
if (error.code === 'VM_BAD_POWER_STATE') { if (error.code === 'VM_BAD_POWER_STATE') {
return this.VM_snapshot($cancelToken, vmRef, nameLabel) return this.VM_snapshot(vmRef, { cancelToken, name_label })
} }
throw error throw error
} }
@ -330,9 +329,8 @@ module.exports = class Vm {
]) ])
} }
@cancelable
@defer @defer
async export($defer, $cancelToken, vmRef, { compress = false, useSnapshot } = {}) { async export($defer, vmRef, { cancelToken = CancelToken.none, compress = false, useSnapshot } = {}) {
const vm = await this.getRecord('VM', vmRef) const vm = await this.getRecord('VM', vmRef)
const taskRef = await this.task_create('VM export', vm.name_label) const taskRef = await this.task_create('VM export', vm.name_label)
$defer.onFailure.call(this, 'task_destroy', taskRef) $defer.onFailure.call(this, 'task_destroy', taskRef)
@ -340,10 +338,10 @@ module.exports = class Vm {
useSnapshot = isVmRunning(vm) useSnapshot = isVmRunning(vm)
} }
const exportedVmRef = useSnapshot const exportedVmRef = useSnapshot
? await this.VM_snapshot($cancelToken, vmRef, `[XO Export] ${vm.name_label}`) ? await this.VM_snapshot(vmRef, { cancelToken, name_label: `[XO Export] ${vm.name_label}` })
: vmRef : vmRef
try { try {
return await this.getResource($cancelToken, '/export/', { return await this.getResource(cancelToken, '/export/', {
query: { query: {
ref: exportedVmRef, ref: exportedVmRef,
use_compression: compress === 'zstd' ? 'zstd' : compress === true || compress === 'gzip' ? 'true' : 'false', use_compression: compress === 'zstd' ? 'zstd' : compress === true || compress === 'gzip' ? 'true' : 'false',
@ -414,8 +412,7 @@ module.exports = class Vm {
} }
@defer @defer
@cancelable async snapshot($defer, vmRef, { cancelToken = CancelToken.none, name_label } = {}) {
async snapshot($cancelToken, $defer, vmRef, nameLabel) {
const vm = await this.getRecord('VM', vmRef) const vm = await this.getRecord('VM', vmRef)
// cannot unplug VBDs on Running, Paused and Suspended VMs // cannot unplug VBDs on Running, Paused and Suspended VMs
if (vm.power_state === 'Halted' && this._ignoreNobakVdis) { if (vm.power_state === 'Halted' && this._ignoreNobakVdis) {
@ -432,8 +429,8 @@ module.exports = class Vm {
}) })
} }
if (nameLabel === undefined) { if (name_label === undefined) {
nameLabel = vm.name_label name_label = vm.name_label
} }
let ref let ref
do { do {
@ -442,7 +439,7 @@ module.exports = class Vm {
ref = await pRetry( ref = await pRetry(
async bail => { async bail => {
try { try {
return await this.callAsync($cancelToken, 'VM.snapshot_with_quiesce', vmRef, nameLabel) return await this.callAsync(cancelToken, 'VM.snapshot_with_quiesce', vmRef, name_label)
} catch (error) { } catch (error) {
if (error == null || error.code !== 'VM_SNAPSHOT_WITH_QUIESCE_FAILED') { if (error == null || error.code !== 'VM_SNAPSHOT_WITH_QUIESCE_FAILED') {
throw bail(error) throw bail(error)
@ -489,7 +486,7 @@ module.exports = class Vm {
} }
} }
} }
ref = await this.callAsync($cancelToken, 'VM.snapshot', vmRef, nameLabel).then(extractOpaqueRef) ref = await this.callAsync(cancelToken, 'VM.snapshot', vmRef, name_label).then(extractOpaqueRef)
} while (false) } while (false)
// VM snapshots are marked as templates, unfortunately it does not play well with XVA export/import // VM snapshots are marked as templates, unfortunately it does not play well with XVA export/import