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

fix(xo-server): limit number of VM exports (#2671)

Browse Source 
Fixes #2669
This commit is contained in:
Julien Fontanet 2018-02-21 17:37:07 +01:00 committed by GitHub
parent 8a010f62fd
commit ede12b6732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/xo-server/package.json
View File

@ -78,7 +78,7 @@
"level": "^3.0.0", "level": "^3.0.0",
"level-party": "^3.0.4", "level-party": "^3.0.4",
"level-sublevel": "^6.6.1", "level-sublevel": "^6.6.1",
"limit-concurrency-decorator": "^0.3.0", "limit-concurrency-decorator": "^0.4.0",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"make-error": "^1", "make-error": "^1",
"micromatch": "^3.1.4", "micromatch": "^3.1.4",

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

@ -9,6 +9,7 @@ import {
cancellable, cancellable,
catchPlus as pCatch, catchPlus as pCatch,
defer, defer,
fromEvent,
ignoreErrors, ignoreErrors,
} from 'promise-toolbox' } from 'promise-toolbox'
import { PassThrough } from 'stream' import { PassThrough } from 'stream'
@ -84,9 +85,6 @@ export const VDI_FORMAT_RAW = 'raw'
export const IPV4_CONFIG_MODES = ['None', 'DHCP', 'Static'] export const IPV4_CONFIG_MODES = ['None', 'DHCP', 'Static']
export const IPV6_CONFIG_MODES = ['None', 'DHCP', 'Static', 'Autoconf'] export const IPV6_CONFIG_MODES = ['None', 'DHCP', 'Static', 'Autoconf']
// do not share the same limit for export and import, it could lead to deadlocks
const importLimit = concurrency(2)
// =================================================================== // ===================================================================
@mixin(mapToArray(mixins)) @mixin(mapToArray(mixins))
@ -711,6 +709,7 @@ export default class Xapi extends XapiBase {
} }
// Returns a stream to the exported VM. // Returns a stream to the exported VM.
@concurrency(2, stream => stream.then(stream => fromEvent(stream, 'end')))
async exportVm (vmId, { compress = true } = {}) { async exportVm (vmId, { compress = true } = {}) {
const vm = this.getObject(vmId) const vm = this.getObject(vmId)
@ -1227,7 +1226,6 @@ export default class Xapi extends XapiBase {
) )
} }
@importLimit
async _importVm (stream, sr, onVmCreation = undefined) { async _importVm (stream, sr, onVmCreation = undefined) {
const taskRef = await this.createTask('VM import') const taskRef = await this.createTask('VM import')
const query = {} const query = {}
@ -1256,7 +1254,6 @@ export default class Xapi extends XapiBase {
return vmRef return vmRef
} }
@importLimit
@deferrable @deferrable
async _importOvaVm ( async _importOvaVm (
$defer, $defer,

6
yarn.lock
View File

@ -7208,9 +7208,9 @@ liftoff@^2.5.0:
rechoir "^0.6.2" rechoir "^0.6.2"
resolve "^1.1.7" resolve "^1.1.7"
limit-concurrency-decorator@^0.3.0: limit-concurrency-decorator@^0.4.0:
version "0.3.0" version "0.4.0"
resolved "https://registry.yarnpkg.com/limit-concurrency-decorator/-/limit-concurrency-decorator-0.3.0.tgz#f01dc6ece361ecc2169400847bad45d80727c79e" resolved "https://registry.yarnpkg.com/limit-concurrency-decorator/-/limit-concurrency-decorator-0.4.0.tgz#d79c4e97b6ef547df2d905cc3acaabbae1bfeed6"
livereload-js@^2.2.0: livereload-js@^2.2.0:
version "2.3.0" version "2.3.0"