Author: jaimin
Date: Fri May 17 18:20:03 2013
New Revision: 1483942
URL: http://svn.apache.org/r1483942
Log:
AMBARI-2160. zookeeper smoke test fails with unknown host exception for secure
cluster. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1483942&r1=1483941&r2=1483942&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri May 17 18:20:03 2013
@@ -862,6 +862,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2160. zookeeper smoke test fails with unknown host exception for
+ secure cluster.(jaimin)
+
AMBARI-2155. Incorrect page display after closing Reassign Master Wizard.
(yusaku)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh?rev=1483942&r1=1483941&r2=1483942&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh
Fri May 17 18:20:03 2013
@@ -24,7 +24,7 @@ smoke_script=$1
smoke_user=$2
conf_dir=$3
export ZOOKEEPER_EXIT_CODE=0
-zkhosts=` grep server $conf_dir/zoo.cfg | cut -f 2 -d '=' | cut -f 1 -d ':'
| tr '\n' ' ' `
+zkhosts=` grep "^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"
# Delete /zk_smoketest znode if exists
