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 B0BB810757 for ; Thu, 6 Mar 2014 00:05:06 +0000 (UTC) Received: (qmail 45260 invoked by uid 500); 6 Mar 2014 00:05:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 45203 invoked by uid 500); 6 Mar 2014 00:05:05 -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 45196 invoked by uid 99); 6 Mar 2014 00:05:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 00:05:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 24B1D93803D; Thu, 6 Mar 2014 00:05:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anthonyxu@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 38c0dd8 Date: Thu, 6 Mar 2014 00:05:05 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master ad88bbb68 -> 38c0dd87a vbdmectics may not exist after host reboot Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38c0dd87 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38c0dd87 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38c0dd87 Branch: refs/heads/master Commit: 38c0dd87a9ad0b558ed6aedd521c21bc10a60fd0 Parents: ad88bbb Author: Anthony Xu Authored: Wed Mar 5 16:04:34 2014 -0800 Committer: Anthony Xu Committed: Wed Mar 5 16:04:34 2014 -0800 ---------------------------------------------------------------------- .../hypervisor/xen/resource/CitrixResourceBase.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38c0dd87/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 4a5de18..b1ad63a 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -2361,9 +2361,15 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe double diskReadKBs = 0; double diskWriteKBs = 0; for (VBD vbd : vm.getVBDs(conn)) { - VBDMetrics record = vbd.getMetrics(conn); - diskReadKBs += record.getIoReadKbs(conn); - diskWriteKBs += record.getIoWriteKbs(conn); + VBDMetrics vbdmetrics = vbd.getMetrics(conn); + if (!isRefNull(vbdmetrics)) { + try { + diskReadKBs += vbdmetrics.getIoReadKbs(conn); + diskWriteKBs += vbdmetrics.getIoWriteKbs(conn); + } catch (Types.HandleInvalid e) { + s_logger.debug("vbdmetrics doesn't exist "); + } + } } if (stats == null) { stats = new VmStatsEntry();