Return-Path: 
 <commits-return-23809-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
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 77D6310B0A
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed, 12 Jun 2013 09:57:49 +0000 (UTC)
Received: (qmail 2463 invoked by uid 500); 12 Jun 2013 09:57:49 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 2388 invoked by uid 500); 12 Jun 2013 09:57:48 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 2364 invoked by uid 99); 12 Jun 2013 09:57:46 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jun 2013 09:57:46 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 514DC8A367A; Wed, 12 Jun 2013 09:57:46 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: weizhou@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 12 Jun 2013 09:57:46 -0000
Message-Id: <5a87328d49824f7789a908ff4d84b28b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] git commit: updated refs/heads/master to 2ed17c7

Updated Branches:
  refs/heads/master fe506d9b6 -> 2ed17c793


CLOUDSTACK-2945: ignore collect disk statistics if vm is not running on KVM or XenServer


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51a3a5a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51a3a5a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51a3a5a9

Branch: refs/heads/master
Commit: 51a3a5a9b56426de4b3818b900d493cf9f439779
Parents: a30f9fa
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Wed Jun 12 11:57:17 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Wed Jun 12 11:57:17 2013 +0200

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51a3a5a9/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 b919f12..1c8ab75 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3421,6 +3421,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
 
     @Override
     public void collectVmDiskStatistics (UserVmVO userVm) {
+        // support KVM and XenServer only
+        if (!userVm.getHypervisorType().equals(HypervisorType.XenServer)
+                && !userVm.getHypervisorType().equals(HypervisorType.KVM))
+            return;        
     	// Collect vm disk statistics from host before stopping Vm
     	long hostId = userVm.getHostId();
     	List<String> vmNames = new ArrayList<String>();