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 1FBF017AA3 for ; Fri, 19 Jun 2015 10:29:59 +0000 (UTC) Received: (qmail 5230 invoked by uid 500); 19 Jun 2015 10:29:58 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 5191 invoked by uid 500); 19 Jun 2015 10:29:58 -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 5182 invoked by uid 99); 19 Jun 2015 10:29:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 10:29:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FE9AE025B; Fri, 19 Jun 2015 10:29:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sanjaytripathi@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 9044a02 Date: Fri, 19 Jun 2015 10:29:58 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 92a9ee097 -> 9044a02d9 VM Snapshot Usage for DATA disk is reported as the size of the DATA disk instead of the actual snapshot size. This closes #485 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9044a02d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9044a02d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9044a02d Branch: refs/heads/master Commit: 9044a02d9aa7f07ab2aef50e29abce9b5d59327b Parents: 92a9ee0 Author: Sanjay Tripathi Authored: Fri Jun 19 15:53:38 2015 +0530 Committer: Sanjay Tripathi Committed: Fri Jun 19 15:55:21 2015 +0530 ---------------------------------------------------------------------- .../hypervisor/xenserver/resource/CitrixResourceBase.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9044a02d/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java index aa02d00..8ed4ffc 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java @@ -3162,6 +3162,15 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } public long getVMSnapshotChainSize(final Connection conn, final VolumeObjectTO volumeTo, final String vmName) throws BadServerResponse, XenAPIException, XmlRpcException { + if (volumeTo.getVolumeType() == Volume.Type.DATADISK) { + VDI dataDisk = VDI.getByUuid(conn, volumeTo.getPath()); + if (dataDisk != null) { + String dataDiskName = dataDisk.getNameLabel(conn); + if (dataDiskName != null && !dataDiskName.isEmpty()) { + volumeTo.setName(dataDiskName); + } + } + } final Set allvolumeVDIs = VDI.getByNameLabel(conn, volumeTo.getName()); long size = 0; for (final VDI vdi : allvolumeVDIs) {