You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/01/29 00:21:47 UTC
[1/2] git commit: updated refs/heads/4.3 to 66d0b3d
Updated Branches:
refs/heads/4.3 85868d81f -> 66d0b3d45
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
(cherry picked from commit e624632dfd532ba2885a8e7dffcb40d1436d02c1)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7ca27f6c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7ca27f6c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7ca27f6c
Branch: refs/heads/4.3
Commit: 7ca27f6cc69d07772f77b0ff53906894f6ba527b
Parents: 85868d8
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Jan 28 15:32:37 2014 -0700
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Tue Jan 28 14:58:57 2014 -0800
----------------------------------------------------------------------
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 8 +++++++-
.../src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ca27f6c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
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
index d3c87d1..6e0c6fa 100755
--- 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 @@ ServerResource {
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 @@ ServerResource {
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 @@ ServerResource {
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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ca27f6c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
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
index 0ceea24..6a5db84 100644
--- 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 class LibvirtVMDef {
}
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");
[2/2] git commit: updated refs/heads/4.3 to 66d0b3d
Posted by an...@apache.org.
CLOUDSTACK-5968 create vm.memballoon.disable agent parameter
(cherry picked from commit 661a19bde3bf9726954f5ba88b8830f8c5a17926)
Signed-off-by: Animesh Chaturvedi <an...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/66d0b3d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/66d0b3d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/66d0b3d4
Branch: refs/heads/4.3
Commit: 66d0b3d45bda73205b59693baeeefdf27e6c9c66
Parents: 7ca27f6
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Jan 28 16:03:52 2014 -0700
Committer: Animesh Chaturvedi <an...@apache.org>
Committed: Tue Jan 28 15:06:54 2014 -0800
----------------------------------------------------------------------
agent/conf/agent.properties | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66d0b3d4/agent/conf/agent.properties
----------------------------------------------------------------------
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 5f5f368..8bd9756 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -114,3 +114,7 @@ domr.scripts.dir=scripts/network/domr/kvm
# for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so
# on,run virsh capabilities for more details.
# 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