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

fix(xapi/task_create): dont use super

Browse Source 
Introduced by 021810201b

It cannot be used due to our mixin architecture.
This commit is contained in:
Julien Fontanet 2021-03-28 23:29:17 +02:00
parent 021810201b
commit b17ec9731a
6 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
@xen-orchestra/backups/RestoreMetadataBackup.js
View File

@ -15,7 +15,7 @@ exports.RestoreMetadataBackup = class RestoreMetadataBackup {
if (backupId.split('/')[0] === DIR_XO_POOL_METADATA_BACKUPS) {
return xapi.putResource(await handler.createReadStream(`${backupId}/data`), PATH_DB_DUMP, {
task: xapi.createTask('Import pool metadata'),
task: xapi.task_create('Import pool metadata'),
})
} else {
return String(await handler.readFile(`${backupId}/data.json`))

2
@xen-orchestra/backups/_PoolMetadataBackup.js
View File

@ -21,7 +21,7 @@ exports.PoolMetadataBackup = class PoolMetadataBackup {
_exportPoolMetadata() {
const xapi = this._pool.$xapi
return xapi.getResource(PATH_DB_DUMP, {
task: xapi.createTask('Export pool metadata'),
task: xapi.task_create('Export pool metadata'),
})
}

4
@xen-orchestra/xapi/src/task.js
View File

@ -2,9 +2,7 @@ const ignoreErrors = require('promise-toolbox/ignoreErrors')
module.exports = class Task {
create(name = 'untitled task', description) {
// don't call `this.createTask` which might be overriden by
// child class and already has the [XO] prefix
return super.createTask(`[XO] ${name}`, description)
return this.createTask(`[XO] ${name}`, description)
}
destroy(ref) {

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

@ -140,10 +140,6 @@ export default class Xapi extends XapiBase {
return loop()
}
createTask(name = 'untitled task', description) {
return super.createTask(`[XO] ${name}`, description)
}
// =================================================================
_registerGenericWatcher(fn) {
@ -586,7 +582,7 @@ export default class Xapi extends XapiBase {
ref: exportedVm.$ref,
use_compression: compress === 'zstd' ? 'zstd' : compress === true || compress === 'gzip' ? 'true' : 'false',
},
task: this.createTask('VM export', vm.name_label),
task: this.task_create('VM export', vm.name_label),
}).catch(error => {
// augment the error with as much relevant info as possible
error.pool_master = this.pool.$master
@ -1139,7 +1135,7 @@ export default class Xapi extends XapiBase {
@cancelable
async _importVm($cancelToken, stream, sr, onVmCreation = undefined) {
const taskRef = await this.createTask('VM import')
const taskRef = await this.task_create('VM import')
const query = {}
if (sr != null) {
@ -1753,7 +1749,7 @@ export default class Xapi extends XapiBase {
return this.getResource($cancelToken, '/export_raw_vdi/', {
query,
task: this.createTask('VDI Export', vdi.name_label),
task: this.task_create('VDI Export', vdi.name_label),
}).catch(error => {
// augment the error with as much relevant info as possible
error.pool_master = vdi.$pool.$master
@ -1788,7 +1784,7 @@ export default class Xapi extends XapiBase {
format,
vdi: vdi.$ref,
},
task: this.createTask('VDI Content Import', vdi.name_label),
task: this.task_create('VDI Content Import', vdi.name_label),
}),
]).catch(error => {
// augment the error with as much relevant info as possible

2
packages/xo-server/src/xapi/mixins/patching.js
View File

@ -354,7 +354,7 @@ export default {
})
const patchRef = await this.putResource(stream, '/pool_patch_upload', {
task: this.createTask('Patch upload', patchInfo.name),
task: this.task_create('Patch upload', patchInfo.name),
}).then(extractOpaqueRef)
return this._getOrWaitObject(patchRef)

4
packages/xo-server/src/xapi/mixins/pool.js
View File

@ -6,7 +6,7 @@ export default {
@cancelable
exportPoolMetadata($cancelToken) {
return this.getResource($cancelToken, PATH_DB_DUMP, {
task: this.createTask('Export pool metadata'),
task: this.task_create('Export pool metadata'),
})
},
@ -19,7 +19,7 @@ export default {
query: {
dry_run: String(!force),
},
task: this.createTask('Import pool metadata'),
task: this.task_create('Import pool metadata'),
})
},
}