[impala] 01/02: IMPALA-9426 Download Python dependencies even skipping bootstrap toolchain

[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 3062a8f67cf35c9390838601342f5854b18fea95
Author: zhaorenhai <zh...@hotmail.com>
AuthorDate: Wed Feb 26 06:48:36 2020 +0000

    IMPALA-9426 Download Python dependencies even skipping bootstrap toolchain
    
    Download Python dependencies even skipping bootstrap toolchain.
    
    Because when you set SKIP_TOOLCHAIN_BOOTSTRAP=true,
    the python dependencies still need to be downloaded.
    The toolchain building process will not download the python dependencies
    autometically
    
    Change-Id: I012314793ffb521001951ab7ec3d7a3ba737c405
    Reviewed-on: http://gerrit.cloudera.org:8080/15297
    Reviewed-by: Tim Armstrong <ta...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/impala-config.sh |  3 +++
 buildall.sh          | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index bfbb2cf..a291391 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -311,6 +311,9 @@ fi
 # If true, will not call $IMPALA_HOME/bin/bootstrap_toolchain.py.
 export SKIP_TOOLCHAIN_BOOTSTRAP=${SKIP_TOOLCHAIN_BOOTSTRAP-false}
 
+# If true, will not download python dependencies.
+export SKIP_PYTHON_DOWNLOAD=${SKIP_PYTHON_DOWNLOAD-false}
+
 # This flag is used in $IMPALA_HOME/cmake_modules/toolchain.cmake.
 # If it's 0, Impala will be built with the compiler in the toolchain directory.
 export USE_SYSTEM_GCC=${USE_SYSTEM_GCC-0}
diff --git a/buildall.sh b/buildall.sh
index b2182a0..96b4abc 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -374,10 +374,8 @@ create_log_dirs() {
 }
 
 bootstrap_dependencies() {
-  # Populate necessary thirdparty components unless it's set to be skipped.
-  if [[ "${SKIP_TOOLCHAIN_BOOTSTRAP}" = true ]]; then
-    echo "SKIP_TOOLCHAIN_BOOTSTRAP is true, skipping download of Python dependencies."
-    echo "SKIP_TOOLCHAIN_BOOTSTRAP is true, skipping toolchain bootstrap."
+  if [[ "${SKIP_PYTHON_DOWNLOAD}" = true ]]; then
+    echo "SKIP_PYTHON_DOWNLOAD is true, skipping python dependencies download."
   else
     echo ">>> Downloading Python dependencies"
     # Download all the Python dependencies we need before doing anything
@@ -388,7 +386,12 @@ bootstrap_dependencies() {
     else
       echo "Finished downloading Python dependencies"
     fi
+  fi
 
+  # Populate necessary thirdparty components unless it's set to be skipped.
+  if [[ "${SKIP_TOOLCHAIN_BOOTSTRAP}" = true ]]; then
+    echo "SKIP_TOOLCHAIN_BOOTSTRAP is true, skipping toolchain bootstrap."
+  else
     echo ">>> Downloading and extracting toolchain dependencies."
     "$IMPALA_HOME/bin/bootstrap_toolchain.py"
     echo "Toolchain bootstrap complete."