You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/11/11 21:49:05 UTC
git commit: updated refs/heads/4.4 to ee8facd
Repository: cloudstack
Updated Branches:
refs/heads/4.4 713a3590b -> ee8facd38
CLOUDSTACK-3383: Fetch CPU utilization more reliable.
This should fix that we can't gather CPU statistics on hypervisors
> Ubuntu 12.04
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee8facd3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee8facd3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee8facd3
Branch: refs/heads/4.4
Commit: ee8facd382b53d04e59ece7a74baddc2737d2ddd
Parents: 713a359
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Nov 11 16:49:38 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Nov 11 21:48:50 2014 +0100
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee8facd3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 03aa849..e075c73 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3255,7 +3255,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private Answer execute(GetHostStatsCommand cmd) {
final Script cpuScript = new Script("/bin/bash", s_logger);
cpuScript.add("-c");
- cpuScript.add("idle=$(top -b -n 1|grep Cpu\\(s\\):|cut -d% -f4|cut -d, -f2);echo $idle");
+ cpuScript.add("idle=$(top -b -n 1| awk -F, '/^[%]*[Cc]pu/{$0=$4; gsub(/[^0-9.,]+/,""); print }'); echo $idle");
final OutputInterpreter.OneLineParser parser = new OutputInterpreter.OneLineParser();
String result = cpuScript.execute(parser);