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

chore(Xapi): use task param with {put,get}Resource

Browse Source
This commit is contained in:
Julien Fontanet 2017-06-27 12:41:37 +02:00
parent 0350838438
commit adc54c8c51
1 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/xapi/index.js
View File

@ -718,21 +718,22 @@ export default class Xapi extends XapiBase {
snapshotRef = (await this._snapshotVm(vm)).$ref snapshotRef = (await this._snapshotVm(vm)).$ref
} }
const taskRef = await this.createTask('VM Export', vm.name_label) const promise = this.getResource(onlyMetadata ? '/export_metadata/' : '/export/', {
if (snapshotRef) {
this.watchTask(taskRef)::pFinally(() => {
this.deleteVm(snapshotRef)::pCatch(noop)
})
}
return this.getResource(onlyMetadata ? '/export_metadata/' : '/export/', {
host, host,
query: { query: {
ref: snapshotRef || vm.$ref, ref: snapshotRef || vm.$ref,
task_id: taskRef,
use_compression: compress ? 'true' : 'false' use_compression: compress ? 'true' : 'false'
} },
task: this.createTask('VM export', vm.name_label)
}) })
if (snapshotRef !== undefined) {
promise.then(_ => _.task::pFinally(() =>
this.deleteVm(snapshotRef)::pCatch(noop)
))
}
return promise
} }
_assertHealthyVdiChain (vdi, childrenMap) { _assertHealthyVdiChain (vdi, childrenMap) {
@ -1176,13 +1177,10 @@ export default class Xapi extends XapiBase {
const taskRef = await this.createTask('VM import') const taskRef = await this.createTask('VM import')
const query = { const query = {
force: onlyMetadata force: onlyMetadata
? 'true'
: undefined,
task_id: taskRef
} }
let host let host
if (sr) { if (sr != null) {
host = sr.$PBDs[0].$host host = sr.$PBDs[0].$host
query.sr_id = sr.$ref query.sr_id = sr.$ref
} }
@ -1193,14 +1191,15 @@ export default class Xapi extends XapiBase {
).then(onVmCreation)::pCatch(noop) ).then(onVmCreation)::pCatch(noop)
} }
const [ vmRef ] = await Promise.all([ const vmRef = await this.putResource(
this.watchTask(taskRef).then(extractOpaqueRef), stream,
this.putResource( onlyMetadata ? '/import_metadata/' : '/import/',
stream, {
onlyMetadata ? '/import_metadata/' : '/import/', host,
{ host, query } query,
) task: taskRef
]) }
).then(extractOpaqueRef)
// Importing a metadata archive of running VMs is currently // Importing a metadata archive of running VMs is currently
// broken: its VBDs are incorrectly seen as attached. // broken: its VBDs are incorrectly seen as attached.
@ -1808,13 +1807,11 @@ export default class Xapi extends XapiBase {
} }
@cancellable @cancellable
async _exportVdi ($cancelToken, vdi, base, format = VDI_FORMAT_VHD) { _exportVdi ($cancelToken, vdi, base, format = VDI_FORMAT_VHD) {
const host = vdi.$SR.$PBDs[0].$host const host = vdi.$SR.$PBDs[0].$host
const taskRef = await this.createTask('VDI Export', vdi.name_label)
const query = { const query = {
format, format,
task_id: taskRef,
vdi: vdi.$ref vdi: vdi.$ref
} }
if (base) { if (base) {
@ -1826,14 +1823,10 @@ export default class Xapi extends XapiBase {
: '' : ''
}`) }`)
const task = this.watchTask(taskRef)
return this.getResource($cancelToken, '/export_raw_vdi/', { return this.getResource($cancelToken, '/export_raw_vdi/', {
host, host,
query query,
}).then(response => { task: this.createTask('VDI Export', vdi.name_label)
response.task = task
return response
}) })
} }
@ -1852,24 +1845,20 @@ export default class Xapi extends XapiBase {
// ----------------------------------------------------------------- // -----------------------------------------------------------------
async _importVdiContent (vdi, stream, format = VDI_FORMAT_VHD) { async _importVdiContent (vdi, stream, format = VDI_FORMAT_VHD) {
const taskRef = await this._createTask('VDI Content Import', vdi.name_label)
const pbd = find(vdi.$SR.$PBDs, 'currently_attached') const pbd = find(vdi.$SR.$PBDs, 'currently_attached')
if (!pbd) { if (pbd === undefined) {
throw new Error('no valid PBDs found') throw new Error('no valid PBDs found')
} }
const task = this.watchTask(taskRef)
await Promise.all([ await Promise.all([
stream.checksumVerified, stream.checksumVerified,
task,
this.putResource(stream, '/import_raw_vdi/', { this.putResource(stream, '/import_raw_vdi/', {
host: pbd.host, host: pbd.host,
query: { query: {
format, format,
task_id: taskRef,
vdi: vdi.$ref vdi: vdi.$ref
} },
task: this.createTask('VDI Content Import', vdi.name_label)
}) })
]) ])
} }