Repository: cloudstack Updated Branches: refs/heads/4.4 72d78e57c -> 10bb8af34
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/10bb8af3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/10bb8af3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/10bb8af3 Branch: refs/heads/4.4 Commit: 10bb8af343c99e2b1fd00d1560714ce7f7ee4318 Parents: 72d78e5 Author: Bharat Kumar <bharat.ku...@citrix.com> Authored: Fri Oct 17 11:24:40 2014 +0530 Committer: Daan Hoogland <dhoogl...@schubergphilis.com> Committed: Thu Feb 26 17:30:27 2015 +0100 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10bb8af3/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 93e99eb..0499a90 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2621,6 +2621,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(); }
