You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/12/05 19:53:19 UTC
[2/2] git commit: updated refs/heads/4.2 to e312282
fix incorrect capacity issue
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e312282d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e312282d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e312282d
Branch: refs/heads/4.2
Commit: e312282d71d76ff94a5ce9b3c498da7666ff94b2
Parents: fa43987
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Dec 5 19:30:47 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Thu Dec 5 19:30:47 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/capacity/CapacityManagerImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e312282d/server/src/com/cloud/capacity/CapacityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 779c0ef..b0d5259 100755
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -542,9 +542,9 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
ClusterDetailsVO clusterDetailRam = _clusterDetailsDao.findDetail(cluster.getId(), "memoryOvercommitRatio");
Float clusterCpuOvercommitRatio = Float.parseFloat(clusterDetailCpu.getValue());
Float clusterRamOvercommitRatio = Float.parseFloat(clusterDetailRam.getValue());
- Float cpuOvercommitRatio = 1f;
- Float ramOvercommitRatio = 1f;
for (VMInstanceVO vm : vms) {
+ Float cpuOvercommitRatio = 1f;
+ Float ramOvercommitRatio = 1f;
UserVmDetailVO vmDetailCpu = _userVmDetailsDao.findDetail(vm.getId(), "cpuOvercommitRatio");
UserVmDetailVO vmDetailRam = _userVmDetailsDao.findDetail(vm.getId(),"memoryOvercommitRatio");
if (vmDetailCpu != null ) {
@@ -562,6 +562,8 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
s_logger.debug("Found " + vmsByLastHostId.size() + " VM, not running on host " + host.getId());
}
for (VMInstanceVO vm : vmsByLastHostId) {
+ Float cpuOvercommitRatio = 1f;
+ Float ramOvercommitRatio = 1f;
long secondsSinceLastUpdate = (DateUtil.currentGMTTime().getTime() - vm.getUpdateTime().getTime()) / 1000;
if (secondsSinceLastUpdate < _vmCapacityReleaseInterval) {
UserVmDetailVO vmDetailCpu = _userVmDetailsDao.findDetail(vm.getId(), "cpuOvercommitRatio");