[impala] 02/02: IMPALA-9566: Sentry service should not be started after IMPALA-8870

[ta...@apache.org]

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

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

commit 5bdd3adb1aef9729a122d57490fefb521eef8885
Author: Fang-Yu Rao <fa...@cloudera.com>
AuthorDate: Sat Mar 28 11:38:59 2020 -0700

    IMPALA-9566: Sentry service should not be started after IMPALA-8870
    
    Due to the incompatibility between different versions of the Guava
    libraries, after bumping up Guava in IMPALA-8870, our build script is
    not supposed to start up the Sentry service when starting the
    minicluster because Sentry has not had its Guava bumped up yet. However,
    the patch for IMPALA-8870 did not take this into consideration when
    $TARGET_FILESYSTEM is s3 and thus run-all.sh still attempts to start
    up Sentry in this case. This patch fixes the bug.
    
    Testing:
    - Verified that this patch passes the core tests in the DEBUG build when
      $TARGET_FILESYSTEM is s3.
    
    Change-Id: If81846f4251fb2aa752ba8c33615cae0ab513a62
    Reviewed-on: http://gerrit.cloudera.org:8080/15590
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Reviewed-by: Csaba Ringhofer <cs...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 testdata/bin/run-all.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/testdata/bin/run-all.sh b/testdata/bin/run-all.sh
index a37c333..2fbeaf5 100755
--- a/testdata/bin/run-all.sh
+++ b/testdata/bin/run-all.sh
@@ -99,9 +99,11 @@ else
   $IMPALA_HOME/testdata/bin/run-hive-server.sh -only_metastore 2>&1 | \
       tee ${IMPALA_CLUSTER_LOGS_DIR}/run-hive-server.log
 
-  echo " --> Starting the Sentry Policy Server"
-  $IMPALA_HOME/testdata/bin/run-sentry-service.sh 2>&1 | \
-      tee ${IMPALA_CLUSTER_LOGS_DIR}/run-sentry-service.log
+  if [[ "$DISABLE_SENTRY" != true ]]; then
+    echo " --> Starting the Sentry Policy Server"
+    $IMPALA_HOME/testdata/bin/run-sentry-service.sh 2>&1 | \
+        tee ${IMPALA_CLUSTER_LOGS_DIR}/run-sentry-service.log
+  fi
 fi
 
 echo " --> Starting Ranger Server"