CLOUDSTACK-5968 create vm.memballoon.disable agent parameter

Marcus Sorensen · Marcus Sorensen · commit e624632dfd53 · 2014-01-28T15:32:37.000-07:00
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -374,6 +374,7 @@ protected String getDefaultScriptsDir() {
     private boolean _can_bridge_firewall;
     protected String _localStoragePath;
     protected String _localStorageUUID;
+    protected boolean _noMemBalloon = false;
     protected String _guestCpuMode;
     protected String _guestCpuModel;
     private final Map <String, String> _pifs = new HashMap<String, String>();
@@ -749,6 +750,11 @@ public boolean configure(String name, Map<String, Object> params)
         value = (String) params.get("cmds.timeout");
         _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");
         _dom0MinMem = NumbersUtil.parseInt(value, 0) * 1024 * 1024;
 
@@ -3489,7 +3495,7 @@ protected LibvirtVMDef createVMFromSpec(VirtualMachineTO vmTO) {
 
         GuestResourceDef grd = new GuestResourceDef();
 
-        if (vmTO.getMinRam() != vmTO.getMaxRam()){
+        if (vmTO.getMinRam() != vmTO.getMaxRam() && !_noMemBalloon) {
             grd.setMemBalloning(true);
             grd.setCurrentMem(vmTO.getMinRam()/1024);
             grd.setMemorySize(vmTO.getMaxRam()/1024);
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -166,6 +166,8 @@ public String toString() {
             }
             if (_memBalloning){
                 resBuidler.append("<devices>\n" + "<memballoon model='virtio'/>\n" + "</devices>\n");
+            } else {
+                resBuidler.append("<devices>\n" + "<memballoon model='none'/>\n" + "</devices>\n");
             }
             if (_vcpu != -1) {
                 resBuidler.append("<vcpu>" + _vcpu + "</vcpu>\n");

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,8 @@ public String toString() {`
`166`	`166`	`}`
`167`	`167`	`if (_memBalloning){`
`168`	`168`	`resBuidler.append("<devices>\n" + "<memballoon model='virtio'/>\n" + "</devices>\n");`
	`169`	`+ } else {`
	`170`	`+ resBuidler.append("<devices>\n" + "<memballoon model='none'/>\n" + "</devices>\n");`
`169`	`171`	`}`
`170`	`172`	`if (_vcpu != -1) {`
`171`	`173`	`resBuidler.append("<vcpu>" + _vcpu + "</vcpu>\n");`