cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject [5/5] git commit: updated refs/heads/4.5 to 36fd780
Date Mon, 10 Nov 2014 09:37:55 GMT
CLOUDSTACK-7760 Data disk size is not considering for primary storage resource limit check


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

Branch: refs/heads/4.5
Commit: 310bb255acd74b6347bd778590e15543eef7333b
Parents: 0e7f1ea
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Fri Oct 17 11:24:40 2014 +0530
Committer: Kishan Kavala <kishan@apache.org>
Committed: Mon Nov 10 15:07:13 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/310bb255/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 1a024a3..28ec6ec 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2682,6 +2682,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Vir
                     throw new InvalidParameterValueException("VM Creation failed. Volume
size: " + diskSize + "GB is out of allowed range. Max: " + customDiskOfferingMaxSize
                             + " Min:" + customDiskOfferingMinSize);
                 }
+                size=size+diskSize*(1024*1024*1024);
             }
             size += _diskOfferingDao.findById(diskOfferingId).getDiskSize();
         }


Mime
View raw message