diff options
| author | Kevin W Monroe <kevin.monroe@canonical.com> | 2017-06-07 16:24:18 +0000 |
|---|---|---|
| committer | Evans Ye <evansye@apache.org> | 2017-07-01 12:52:57 +0000 |
| commit | e1c4a39bb3e6161e590e09eb0756da03334f8dc0 (patch) | |
| tree | e9d900e0bcd940ac95c4c52fd0ab381e507b5737 | |
| parent | 74e58d27696dfdfe76eef3120fa54f59854809e2 (diff) | |
BIGTOP-2801: charm race condition when gathering metrics
Closes #233
3 files changed, 4 insertions, 5 deletions
diff --git a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml index 2709e8d4..16b5e431 100644 --- a/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml +++ b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml @@ -22,7 +22,6 @@ options: ports: namenode: port: 8020 - exposed_on: 'namenode' nn_webapp_http: port: 50070 exposed_on: 'namenode' 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 f091b674..cb7d2462 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: hdfs getconf -namenodes 2>/dev/null | wc -l + command: "charms.reactive is_state apache-bigtop-namenode.ready && hdfs getconf -namenodes 2>/dev/null | wc -l" offlinedatanodes: type: gauge description: number of dead datanodes in the cluster (must be run as hdfs) - command: 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: 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 137e07e1..08fbea05 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: 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" |