[impala] 01/03: Fix condition for starting YARN on USE_CDP_HIVE=true

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit d873922e717d4ef5b78f13b3cf677281d1c7b502
Author: Joe McDonnell <jo...@cloudera.com>
AuthorDate: Wed May 15 10:23:17 2019 -0700

    Fix condition for starting YARN on USE_CDP_HIVE=true
    
    Dataload on Hive 3 uses YARN, but YARN is not needed for Hive 2
    dataload. This fixes the condition so that YARN does not start
    for USE_CDP_HIVE=false (Hive 2). This fixes a similar condition
    for manipulating the classpath in testdata/bin/run-hive-server.sh.
    
    Change-Id: If2b0a529eadd5a436f0318229600180f72a27207
    Reviewed-on: http://gerrit.cloudera.org:8080/13343
    Reviewed-by: Todd Lipcon <to...@apache.org>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 testdata/bin/run-hive-server.sh | 2 +-
 testdata/cluster/admin          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testdata/bin/run-hive-server.sh b/testdata/bin/run-hive-server.sh
index 473a654..a2f4bba 100755
--- a/testdata/bin/run-hive-server.sh
+++ b/testdata/bin/run-hive-server.sh
@@ -70,7 +70,7 @@ suspend=n,address=30010"
 # CDH Hive metastore scripts do not do so. This is currently to make sure that we can run
 # all the tests including sentry tests
 # TODO: This can be removed when we move to Ranger completely
-if [[ $USE_CDP_HIVE && -n "$SENTRY_HOME" ]]; then
+if [[ "$USE_CDP_HIVE" = "true" && -n "$SENTRY_HOME" ]]; then
   for f in ${SENTRY_HOME}/lib/sentry-binding-hive*.jar; do
     FILE_NAME=$(basename $f)
     # exclude all the hive jars from being included in the classpath since Sentry
diff --git a/testdata/cluster/admin b/testdata/cluster/admin
index 9eafd8c..6a5ea33 100755
--- a/testdata/cluster/admin
+++ b/testdata/cluster/admin
@@ -35,7 +35,7 @@ setup_report_build_error
 : ${INCLUDE_YARN=}
 
 # For Hive 3, we require Yarn for Tez support.
-if [[ $USE_CDP_HIVE ]]; then
+if "$USE_CDP_HIVE"; then
   INCLUDE_YARN=1
 fi