cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [15/50] [abbrv] git commit: updated refs/heads/disk-cache to 99d67cb
Date Mon, 02 Sep 2013 20:05:01 GMT
fix to add the the overcommit details of the vms in uservm details table when decreasing the
overcommit to one.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80e2934b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80e2934b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80e2934b

Branch: refs/heads/disk-cache
Commit: 80e2934bb72f3c660384913d54f13a8d2688fb5d
Parents: 052d6e2
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Fri Aug 2 19:03:09 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Fri Aug 2 19:09:26 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80e2934b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index b54d1fe..15a9a82 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -872,7 +872,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
                     _uservmDetailsDao.persist(vmDetail_cpu);
                     _uservmDetailsDao.persist(vmDetail_ram);
                 }
-                else if (((Float.parseFloat(cluster_detail_cpu.getValue()) > 1f || Float.parseFloat(cluster_detail_ram.getValue())
> 1f))) {
+                else if (_uservmDetailsDao.findDetail(vm.getId(),"cpuOvercommitRatio") !=
null) {
                     UserVmDetailVO vmDetail_cpu = _uservmDetailsDao.findDetail(vm.getId(),
"cpuOvercommitRatio");
                     vmDetail_cpu.setValue(cluster_detail_cpu.getValue());
                     UserVmDetailVO vmDetail_ram = _uservmDetailsDao.findDetail(vm.getId(),
"memoryOvercommitRatio");


Mime
View raw message