cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [28/50] [abbrv] git commit: updated refs/heads/statscollector-graphite to e06a814
Date Tue, 11 Nov 2014 12:04:07 GMT
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/ea99ff1c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea99ff1c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea99ff1c

Branch: refs/heads/statscollector-graphite
Commit: ea99ff1c8622eadf8024ee9922d5f2b2b18d4f80
Parents: cf27ecd
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Wed Oct 22 11:29:22 2014 +0530
Committer: Kishan Kavala <kishan@apache.org>
Committed: Mon Nov 10 14:30:42 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/ea99ff1c/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 e3bfbe5..7406ca0 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);


Mime
View raw message