You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/12 13:59:26 UTC
[2/2] git commit: updated refs/heads/4.6 to 65bf2ed
Merge pull request #1182 from ustcweizhou/CLOUDSTACK-9113-getVmStats
[4.6] CLOUDSTACK-9113: skip vm with inconsistent state when getVmStats/getVmDiskStatson KVM, if there is a vm has inconsistent state between hypervisor and db, the getVmStat will terminate and return null, all vm stats will not be updated.
we should skip the vm which has inconsistent state, and continue on others.
* pr/1182:
CLOUDSTACK-9113: skip vm with inconsistent state when getVmStats/getVmDiskStats
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65bf2edf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65bf2edf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65bf2edf
Branch: refs/heads/4.6
Commit: 65bf2edfa196601d68e82f09012a393ee73499a2
Parents: 61ebb53 24edf1c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sat Dec 12 13:58:48 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Dec 12 13:58:49 2015 +0100
----------------------------------------------------------------------
.../LibvirtGetVmDiskStatsCommandWrapper.java | 16 ++++++++++------
.../wrapper/LibvirtGetVmStatsCommandWrapper.java | 14 +++++++++-----
2 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------