You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/06/12 11:57:46 UTC
[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....@leaseweb.com>
Authored: Wed Jun 12 11:57:17 2013 +0200
Committer: Wei Zhou <w....@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>();
[2/2] git commit: updated refs/heads/master to 2ed17c7
Posted by we...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2ed17c79
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2ed17c79
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2ed17c79
Branch: refs/heads/master
Commit: 2ed17c7930e1c35ea79e70a39c86336d554f5218
Parents: 51a3a5a fe506d9
Author: Wei Zhou <w....@leaseweb.com>
Authored: Wed Jun 12 11:57:37 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Wed Jun 12 11:57:37 2013 +0200
----------------------------------------------------------------------
.../hypervisor/xen/discoverer/XcpServerDiscoverer.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------