You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/11/10 20:57:14 UTC
[2/2] ambari git commit: AMBARI-8262. ZK Service check fails on HDP
1.3 (aonishuk)
AMBARI-8262. ZK Service check fails on HDP 1.3 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f09aae3e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f09aae3e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f09aae3e
Branch: refs/heads/branch-1.7.0
Commit: f09aae3ea269b0198a015d2121ac46c7dab9c346
Parents: 4239114
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Nov 10 21:57:01 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Nov 10 21:57:01 2014 +0200
----------------------------------------------------------------------
.../stacks/HDP/1.3.2/services/ZOOKEEPER/package/files/zkSmoke.sh | 2 +-
.../stacks/HDP/2.0.6/services/ZOOKEEPER/package/files/zkSmoke.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f09aae3e/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/files/zkSmoke.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/files/zkSmoke.sh b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/files/zkSmoke.sh
index a6aa717..c07d3c7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/files/zkSmoke.sh
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/files/zkSmoke.sh
@@ -31,7 +31,7 @@ export ZOOKEEPER_EXIT_CODE=0
test_output_file=/tmp/zkSmoke.out
errors_expr="ERROR|Exception"
acceptable_expr="SecurityException"
-zkhosts=` grep "^server\.[[:digit:]]" $conf_dir/zoo.cfg | cut -f 2 -d '=' | cut -f 1 -d ':' | tr '\n' ' ' `
+zkhosts=` grep "^\s*server\.[[:digit:]]" $conf_dir/zoo.cfg | cut -f 2 -d '=' | cut -f 1 -d ':' | tr '\n' ' ' `
zk_node1=`echo $zkhosts | tr ' ' '\n' | head -n 1`
echo "zk_node1=$zk_node1"
if [[ $security_enabled == "True" ]]; then
http://git-wip-us.apache.org/repos/asf/ambari/blob/f09aae3e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/files/zkSmoke.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/files/zkSmoke.sh b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/files/zkSmoke.sh
index f31a6ea..f6ff2ba 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/files/zkSmoke.sh
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/files/zkSmoke.sh
@@ -31,7 +31,7 @@ export ZOOKEEPER_EXIT_CODE=0
test_output_file=/tmp/zkSmoke.out
errors_expr="ERROR|Exception"
acceptable_expr="SecurityException"
-zkhosts=` grep "^server\.[[:digit:]]" $conf_dir/zoo.cfg | cut -f 2 -d '=' | cut -f 1 -d ':' | tr '\n' ' ' `
+zkhosts=` grep "^\s*server\.[[:digit:]]" $conf_dir/zoo.cfg | cut -f 2 -d '=' | cut -f 1 -d ':' | tr '\n' ' ' `
zk_node1=`echo $zkhosts | tr ' ' '\n' | head -n 1`
echo "zk_node1=$zk_node1"
if [[ $security_enabled == "True" ]]; then