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 E690210B9D for ; Mon, 8 Dec 2014 10:09:01 +0000 (UTC) Received: (qmail 86868 invoked by uid 500); 8 Dec 2014 10:08:50 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 86821 invoked by uid 500); 8 Dec 2014 10:08:50 -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 86453 invoked by uid 99); 8 Dec 2014 10:08:50 -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, 08 Dec 2014 10:08:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D55BD9C0AA7; Mon, 8 Dec 2014 10:08:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajani@apache.org To: commits@cloudstack.apache.org Date: Mon, 08 Dec 2014 10:09:08 -0000 Message-Id: In-Reply-To: <688e4767e27c455d8a8ee5bf2c0c53f2@git.apache.org> References: <688e4767e27c455d8a8ee5bf2c0c53f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] git commit: updated refs/heads/master to b61733d Fixed root disk resize on deploy for RBD. Signed-off-by: Wido den Hollander (cherry picked from commit 3a52a83faeaa72a8488b2db1253fef6d3308d708) Signed-off-by: Rohit Yadav Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a36681b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a36681b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a36681b Branch: refs/heads/master Commit: 3a36681b6edbf317ef75ca96acb24522ca341556 Parents: bf9e1ae Author: Logan Barfield Authored: Thu Oct 30 16:18:52 2014 -0400 Committer: Rohit Yadav Committed: Tue Dec 2 01:56:37 2014 +0530 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a36681b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java index ea3e1d6..86176d2 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java @@ -1080,6 +1080,13 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { rbd.clone(template.getName(), this.rbdTemplateSnapName, io, disk.getName(), this.rbdFeatures, this.rbdOrder); s_logger.debug("Succesfully cloned " + template.getName() + "@" + this.rbdTemplateSnapName + " to " + disk.getName()); + /* We also need to resize the image if the VM was deployed with a larger root disk size */ + if (disk.getVirtualSize() > template.getVirtualSize()) { + RbdImage diskImage = rbd.open(disk.getName()); + diskImage.resize(disk.getVirtualSize()); + rbd.close(diskImage); + s_logger.debug("Resized " + disk.getName() + " to " + disk.getVirtualSize()); + } } rbd.close(srcImage);