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/991d783e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/991d783e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/991d783e Branch: refs/heads/statscollector-graphite Commit: 991d783e0332d07cba18d046dfc7220a063f670f Parents: ea99ff1 Author: Bharat Kumar <bharat.ku...@citrix.com> Authored: Fri Oct 17 11:24:40 2014 +0530 Committer: Kishan Kavala <kis...@apache.org> Committed: Mon Nov 10 14:30:42 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/991d783e/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 8096841..65ae3da 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2685,6 +2685,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(); }
