AMBARI-18995. HBASE service check fails if run with tty=true (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e62bf6ec Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e62bf6ec Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e62bf6ec Branch: refs/heads/branch-feature-AMBARI-18901 Commit: e62bf6ec8d1fee99c562a0d9b4d9ea34525cfaae Parents: 5bdcc41 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon Nov 28 17:01:36 2016 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Nov 28 17:01:36 2016 +0200 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e62bf6ec/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh index 5c320c0..8b085e8 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/files/hbaseSmokeVerify.sh @@ -25,7 +25,7 @@ hbase_cmd=$3 echo "scan 'ambarismoketest'" | $hbase_cmd --config $conf_dir shell > /tmp/hbase_chk_verify cat /tmp/hbase_chk_verify echo "Looking for $data" -grep -q $data /tmp/hbase_chk_verify +tr -d '\n|\t| ' < /tmp/hbase_chk_verify | grep -q $data if [ "$?" -ne 0 ] then exit 1