apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5968 create vm.memballoon.disable agent parameter

Browse Source
This commit is contained in:
Marcus Sorensen 2014-01-28 10:44:44 -07:00
parent 29e22384b7
commit 1530c162e5
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/conf/agent.properties
View File

@ -114,3 +114,7 @@ domr.scripts.dir=scripts/network/domr/kvm
# for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so # for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so
# on,run virsh capabilities for more details. # on,run virsh capabilities for more details.
# guest.cpu.model= # guest.cpu.model=
#
# vm.memballoon.disable=true
# Disable memory ballooning on vm guests for overcommit, by default overcommit
# feature enables balloon and sets currentMemory to a minimum value.

8
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -424,6 +424,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private boolean _canBridgeFirewall; private boolean _canBridgeFirewall;
protected String _localStoragePath; protected String _localStoragePath;
protected String _localStorageUUID; protected String _localStorageUUID;
protected boolean _noMemBalloon = false;
protected String _guestCpuMode; protected String _guestCpuMode;
protected String _guestCpuModel; protected String _guestCpuModel;
private final Map<String, String> _pifs = new HashMap<String, String>(); private final Map<String, String> _pifs = new HashMap<String, String>();
@ -771,6 +772,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
value = (String)params.get("cmds.timeout"); value = (String)params.get("cmds.timeout");
_cmdsTimeout = NumbersUtil.parseInt(value, 7200) * 1000; _cmdsTimeout = NumbersUtil.parseInt(value, 7200) * 1000;
value = (String) params.get("vm.memballoon.disable");
if (Boolean.parseBoolean(value)) {
_noMemBalloon = true;
}
value = (String)params.get("host.reserved.mem.mb"); value = (String)params.get("host.reserved.mem.mb");
_dom0MinMem = NumbersUtil.parseInt(value, 0) * 1024 * 1024; _dom0MinMem = NumbersUtil.parseInt(value, 0) * 1024 * 1024;
@ -3426,7 +3432,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
GuestResourceDef grd = new GuestResourceDef(); GuestResourceDef grd = new GuestResourceDef();
if (vmTO.getMinRam() != vmTO.getMaxRam()) { if (vmTO.getMinRam() != vmTO.getMaxRam() && !_noMemBalloon) {
grd.setMemBalloning(true); grd.setMemBalloning(true);
grd.setCurrentMem(vmTO.getMinRam() / 1024); grd.setCurrentMem(vmTO.getMinRam() / 1024);
grd.setMemorySize(vmTO.getMaxRam() / 1024); grd.setMemorySize(vmTO.getMaxRam() / 1024);