Updated Branches: refs/heads/trunk 6814ab7e4 -> 7b2f40ed7
AMBARI-2749. Zookeeper service check returns failure even if there was no ERROR or Exception. (swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/7b2f40ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7b2f40ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7b2f40ed Branch: refs/heads/trunk Commit: 7b2f40ed79a70a91dcb98828d62f134df847648a Parents: 6814ab7 Author: Siddharth Wagle <[email protected]> Authored: Fri Jul 26 14:00:15 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Fri Jul 26 14:40:29 2013 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7b2f40ed/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh index 64db50c..a6e3441 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh +++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/files/zkSmoke.sh @@ -41,7 +41,7 @@ fi function verify_output() { if [ -f $test_output_file ]; then - errors=`grep -iE $errors_expr $test_output_file` + errors=`grep -E $errors_expr $test_output_file` if [ "$?" -eq 0 ]; then echo "Error found in the zookeeper smoke test. Exiting." echo $errors @@ -51,9 +51,9 @@ function verify_output() { } # Delete /zk_smoketest znode if exists -su - $smoke_user -c "source $conf_dir/zookeeper-env.sh ; echo delete /zk_smoketest | ${smoke_script} -server $zk_node1:$client_port 2>&1 >> $test_output_file" +su - $smoke_user -c "source $conf_dir/zookeeper-env.sh ; echo delete /zk_smoketest | ${smoke_script} -server $zk_node1:$client_port" 2>&1>$test_output_file # Create /zk_smoketest znode on one zookeeper server -su - $smoke_user -c "source $conf_dir/zookeeper-env.sh ; echo create /zk_smoketest smoke_data | ${smoke_script} -server $zk_node1:$client_port 2>&1 >> $test_output_file" +su - $smoke_user -c "source $conf_dir/zookeeper-env.sh ; echo create /zk_smoketest smoke_data | ${smoke_script} -server $zk_node1:$client_port" 2>&1>>$test_output_file verify_output for i in $zkhosts ; do
