You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/11/10 10:37:53 UTC
[3/5] git commit: updated refs/heads/4.5 to 36fd780
CLOUDSTACK-7763 Reservations for VMware VMs remain after dynamic scaling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e7f1ea9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e7f1ea9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e7f1ea9
Branch: refs/heads/4.5
Commit: 0e7f1ea9b819de197e70a088e92d7ffb7016d063
Parents: de3eb88
Author: Bharat Kumar <bh...@citrix.com>
Authored: Wed Oct 22 11:29:22 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Mon Nov 10 15:07:13 2014 +0530
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e7f1ea9/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 085b6bb..fa66769 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1281,7 +1281,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
VmwareHypervisorHost hyperHost = getHyperHost(context);
VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(cmd.getVmName());
VirtualMachineConfigSpec vmConfigSpec = new VirtualMachineConfigSpec();
- int ramMb = (int)(vmSpec.getMinRam() / (1024 * 1024));
+ int ramMb = getReservedMemoryMb(vmSpec);
long hotaddIncrementSizeInMb;
long hotaddMemoryLimitInMb;
long requestedMaxMemoryInMb = vmSpec.getMaxRam() / (1024 * 1024);