You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by kw...@apache.org on 2017/07/07 21:59:43 UTC
bigtop git commit: BIGTOP-2836: charm metric collector race condition
Repository: bigtop
Updated Branches:
refs/heads/master 63c75d4f1 -> 32c353ef0
BIGTOP-2836: charm metric collector race condition
Closes #252
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/32c353ef
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/32c353ef
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/32c353ef
Branch: refs/heads/master
Commit: 32c353ef0531f2ccda2685a9d0e867e793e4e6b3
Parents: 63c75d4
Author: Kevin W Monroe <ke...@canonical.com>
Authored: Fri Jul 7 16:55:46 2017 +0000
Committer: Kevin W Monroe <ke...@canonical.com>
Committed: Fri Jul 7 16:59:16 2017 -0500
----------------------------------------------------------------------
.../src/charm/hadoop/layer-hadoop-namenode/metrics.yaml | 6 +++---
.../src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml | 2 +-
.../src/charm/zookeeper/layer-zookeeper/metrics.yaml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/32c353ef/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml
index cb7d246..3bca549 100644
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/metrics.yaml
@@ -2,12 +2,12 @@ metrics:
namenodes:
type: gauge
description: number of namenodes in the cluster
- command: "charms.reactive is_state apache-bigtop-namenode.ready && hdfs getconf -namenodes 2>/dev/null | wc -l"
+ command: "charms.reactive is_state apache-bigtop-namenode.ready && su hdfs -c 'hdfs getconf -namenodes 2>/dev/null | wc -l' || echo 0"
offlinedatanodes:
type: gauge
description: number of dead datanodes in the cluster (must be run as hdfs)
- command: "charms.reactive is_state apache-bigtop-namenode.ready && su hdfs -c 'hdfs dfsadmin -report -dead 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0'"
+ command: "charms.reactive is_state apache-bigtop-namenode.ready && su hdfs -c 'hdfs dfsadmin -report -dead 2>/dev/null | grep -i datanodes | grep -o [0-9]' || echo 0"
onlinedatanodes:
type: gauge
description: number of live datanodes in the cluster (must be run as hdfs)
- command: "charms.reactive is_state apache-bigtop-namenode.ready && su hdfs -c 'hdfs dfsadmin -report -live 2>/dev/null | grep -i datanodes | grep -o [0-9] || echo 0'"
+ command: "charms.reactive is_state apache-bigtop-namenode.ready && su hdfs -c 'hdfs dfsadmin -report -live 2>/dev/null | grep -i datanodes | grep -o [0-9]' || echo 0"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/32c353ef/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml
index 08fbea0..bfaf247 100644
--- a/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml
+++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml
@@ -2,4 +2,4 @@ metrics:
nodemanagers:
type: gauge
description: number of running node managers in the cluster
- command: "charms.reactive is_state apache-bigtop-resourcemanager.ready && yarn node -list -all 2>/dev/null | grep RUNNING | wc -l"
+ command: "charms.reactive is_state apache-bigtop-resourcemanager.ready && yarn node -list -all 2>/dev/null | grep RUNNING | wc -l || echo 0"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/32c353ef/bigtop-packages/src/charm/zookeeper/layer-zookeeper/metrics.yaml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/metrics.yaml b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/metrics.yaml
index b7fc353..f82414f 100644
--- a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/metrics.yaml
+++ b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/metrics.yaml
@@ -2,4 +2,4 @@ metrics:
peers:
type: gauge
description: number of zookeeper servers in the cluster
- command: grep ^server /etc/zookeeper/conf/zoo.cfg | wc -l
+ command: grep ^server /etc/zookeeper/conf/zoo.cfg | wc -l || echo 0