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

dont use set_memory_limits if VM is running

Browse Source
This commit is contained in:
Julien Fontanet 2017-12-28 15:05:11 +01:00
parent feecd51770
commit 09e7f04794
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xapi/mixins/vm.js
View File

@ -322,18 +322,30 @@ export default {
get: vm => +vm.memory_dynamic_max, get: vm => +vm.memory_dynamic_max,
preprocess: parseSize, preprocess: parseSize,
set (dynamicMax, vm) { set (dynamicMax, vm) {
const { $ref } = vm
const dynamicMin = Math.min(vm.memory_dynamic_min, dynamicMax)
if (isVmRunning(vm)) {
return this.call(
'VM.set_memory_dynamic_range',
$ref,
dynamicMin,
dynamicMax
)
}
const staticMin = Math.min(vm.memory_static_min, dynamicMax) const staticMin = Math.min(vm.memory_static_min, dynamicMax)
return this.call( return this.call(
'VM.set_memory_limits', 'VM.set_memory_limits',
vm.$ref, $ref,
staticMin, staticMin,
Math.max(dynamicMax, vm.memory_static_max), Math.max(dynamicMax, vm.memory_static_max),
Math.min(vm.memory_dynamic_min, dynamicMax), dynamicMin,
dynamicMax dynamicMax
)::pCatch({ code: 'MEMORY_CONSTRAINT_VIOLATION' }, () => )::pCatch({ code: 'MEMORY_CONSTRAINT_VIOLATION' }, () =>
this.call( this.call(
'VM.set_memory_limits', 'VM.set_memory_limits',
vm.$ref, $ref,
staticMin, staticMin,
dynamicMax, dynamicMax,
dynamicMax, dynamicMax,