diff options
| author | Kevin W Monroe <kevin.monroe@canonical.com> | 2017-07-07 16:55:46 +0000 |
|---|---|---|
| committer | Kevin W Monroe <kevin.monroe@canonical.com> | 2017-07-07 16:59:16 -0500 |
| commit | 32c353ef0531f2ccda2685a9d0e867e793e4e6b3 (patch) | |
| tree | 382450feeabfee4dd3739f1f28d915765497d6ed | |
| parent | 63c75d4f1c2e7973150ee067ecebcf008a669c50 (diff) | |
BIGTOP-2836: charm metric collector race condition
Closes #252
3 files changed, 5 insertions, 5 deletions
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 cb7d2462..3bca549a 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" 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 08fbea05..bfaf2479 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" diff --git a/bigtop-packages/src/charm/zookeeper/layer-zookeeper/metrics.yaml b/bigtop-packages/src/charm/zookeeper/layer-zookeeper/metrics.yaml index b7fc3537..f82414f6 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 |