You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/07/01 13:37:08 UTC
[24/50] [abbrv] bigtop git commit: BIGTOP-2801: charm race condition
when gathering metrics
BIGTOP-2801: charm race condition when gathering metrics
Closes #233
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e1c4a39b
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e1c4a39b
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e1c4a39b
Branch: refs/heads/branch-1.2
Commit: e1c4a39bb3e6161e590e09eb0756da03334f8dc0
Parents: 74e58d2
Author: Kevin W Monroe <ke...@canonical.com>
Authored: Wed Jun 7 16:24:18 2017 +0000
Committer: Evans Ye <ev...@apache.org>
Committed: Sat Jul 1 12:52:57 2017 +0000
----------------------------------------------------------------------
.../src/charm/hadoop/layer-hadoop-namenode/layer.yaml | 1 -
.../src/charm/hadoop/layer-hadoop-namenode/metrics.yaml | 6 +++---
.../src/charm/hadoop/layer-hadoop-resourcemanager/metrics.yaml | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e1c4a39b/bigtop-packages/src/charm/hadoop/layer-hadoop-namenode/layer.yaml
----------------------------------------------------------------------
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 2709e8d..16b5e43 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'
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e1c4a39b/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 f091b67..cb7d246 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'"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e1c4a39b/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 137e07e..08fbea0 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"