Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56DAF17401 for ; Mon, 10 Nov 2014 09:37:52 +0000 (UTC) Received: (qmail 98212 invoked by uid 500); 10 Nov 2014 09:37:51 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 98059 invoked by uid 500); 10 Nov 2014 09:37:51 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 97793 invoked by uid 99); 10 Nov 2014 09:37:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Nov 2014 09:37:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 983128BFBFA; Mon, 10 Nov 2014 09:37:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Date: Mon, 10 Nov 2014 09:37:55 -0000 Message-Id: <9cd2bf391c1643a1b80ecde099789478@git.apache.org> In-Reply-To: <1c58133e3d424c2b97995c51dc2fe96a@git.apache.org> References: <1c58133e3d424c2b97995c51dc2fe96a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: updated refs/heads/4.5 to 36fd780 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 Authored: Fri Oct 17 11:24:40 2014 +0530 Committer: Kishan Kavala 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(); }