This is an automated email from the ASF dual-hosted git repository. dbecker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit 57370fb06c15122e201aee44b455220caf6d96f2 Author: Joe McDonnell <[email protected]> AuthorDate: Mon Jun 5 19:13:05 2023 -0700 IMPALA-12188: Avoid unnecessary output from sourcing bin/impala-config.sh Many scripts source bin/impala-config.sh to get necessary environment variables. The print statements in bin/impala-config.sh for those scripts are not interesting and make the build logs noisier. This changes a variety of build scripts / utility scripts to silence the output of sourcing bin/impala-config.sh. This continues to print the output for invocations of buildall.sh. Testing: - Ran a build and looked at the output Change-Id: Ib4e39f50c7efb8c42a6d3597be0e18c4c79457c5 Reviewed-on: http://gerrit.cloudera.org:8080/20098 Tested-by: Impala Public Jenkins <[email protected]> Reviewed-by: Yifan Zhang <[email protected]> Reviewed-by: Joe McDonnell <[email protected]> --- bin/bootstrap_development.sh | 2 +- bin/create_testdata.sh | 2 +- bin/gen-cscope.sh | 2 +- bin/init-impala-python.sh | 2 +- bin/jenkins/all-tests.sh | 2 +- bin/jenkins/build-all-flag-combinations.sh | 2 +- bin/jenkins/dockerized-impala-run-tests.sh | 2 +- bin/run-cpplint.sh | 2 +- testdata/bin/run-ranger-server.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/bootstrap_development.sh b/bin/bootstrap_development.sh index 8ff6f4884..f3c552260 100755 --- a/bin/bootstrap_development.sh +++ b/bin/bootstrap_development.sh @@ -44,7 +44,7 @@ BINDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "${BINDIR}/bootstrap_system.sh" export MAX_PYTEST_FAILURES=0 -source bin/impala-config.sh +source bin/impala-config.sh > /dev/null 2>&1 export NUM_CONCURRENT_TESTS=$(nproc) time -p ./buildall.sh -format -testdata -skiptests diff --git a/bin/create_testdata.sh b/bin/create_testdata.sh index 9c703621a..41a17d2ab 100755 --- a/bin/create_testdata.sh +++ b/bin/create_testdata.sh @@ -23,7 +23,7 @@ setup_report_build_error bin=`dirname "$0"` bin=`cd "$bin"; pwd` -. "$bin"/impala-config.sh +. "$bin"/impala-config.sh > /dev/null 2>&1 # location of the generated data DATALOC=$IMPALA_HOME/testdata/target diff --git a/bin/gen-cscope.sh b/bin/gen-cscope.sh index d3b442358..920b8d51b 100755 --- a/bin/gen-cscope.sh +++ b/bin/gen-cscope.sh @@ -20,7 +20,7 @@ bin=`dirname "$0"` bin=`cd "$bin"; pwd` -. "$bin"/impala-config.sh +. "$bin"/impala-config.sh > /dev/null 2>&1 # Generate list of files for Cscope to index. # -ignore_readdir_race: this scripts runs in parallel with other build steps, so races diff --git a/bin/init-impala-python.sh b/bin/init-impala-python.sh index 360d2df89..35c90b90c 100755 --- a/bin/init-impala-python.sh +++ b/bin/init-impala-python.sh @@ -25,7 +25,7 @@ bin=`dirname "$0"` bin=`cd "$bin"; pwd` -. "$bin"/impala-config.sh +. "$bin"/impala-config.sh > /dev/null 2>&1 function print_usage { echo "init-impala-python.sh - Script called from CMake to init python venvs" diff --git a/bin/jenkins/all-tests.sh b/bin/jenkins/all-tests.sh index 7ebe294eb..41eef97ac 100644 --- a/bin/jenkins/all-tests.sh +++ b/bin/jenkins/all-tests.sh @@ -67,7 +67,7 @@ if ! bin/bootstrap_development.sh; then RET_CODE=1 fi -source bin/impala-config.sh +source bin/impala-config.sh > /dev/null 2>&1 # Sanity check: bootstrap_development.sh should not have modified any of # the Impala files. This is important for the continued functioning of diff --git a/bin/jenkins/build-all-flag-combinations.sh b/bin/jenkins/build-all-flag-combinations.sh index 0d503d4e5..d10f92f06 100755 --- a/bin/jenkins/build-all-flag-combinations.sh +++ b/bin/jenkins/build-all-flag-combinations.sh @@ -30,7 +30,7 @@ setup_report_build_error export IMPALA_MAVEN_OPTIONS="-U" -. bin/impala-config.sh +. bin/impala-config.sh > /dev/null 2>&1 : ${GENERATE_M2_ARCHIVE:=false} diff --git a/bin/jenkins/dockerized-impala-run-tests.sh b/bin/jenkins/dockerized-impala-run-tests.sh index a5e3b165a..c2ed71a35 100755 --- a/bin/jenkins/dockerized-impala-run-tests.sh +++ b/bin/jenkins/dockerized-impala-run-tests.sh @@ -28,7 +28,7 @@ DOCKER_NETWORK="test-impala-cluster" # Helper to source impala-config.sh, which may have unbound variables source_impala_config() { set +u - . ./bin/impala-config.sh + . ./bin/impala-config.sh > /dev/null 2>&1 set -u } diff --git a/bin/run-cpplint.sh b/bin/run-cpplint.sh index c97074aff..b389e7469 100755 --- a/bin/run-cpplint.sh +++ b/bin/run-cpplint.sh @@ -20,7 +20,7 @@ bin=`dirname "$0"` bin=`cd "$bin"; pwd` -. "$bin"/impala-config.sh +. "$bin"/impala-config.sh > /dev/null 2>&1 files=`find $IMPALA_BE_DIR/src -regex '.*\(cc\|h\)' -printf '%p '` cpplint.py $@ ${files} diff --git a/testdata/bin/run-ranger-server.sh b/testdata/bin/run-ranger-server.sh index 9a6e29676..6b03ad3dd 100755 --- a/testdata/bin/run-ranger-server.sh +++ b/testdata/bin/run-ranger-server.sh @@ -29,7 +29,7 @@ fi # IMPALA-8815: don't allow additional potentially incompatible jars to get onto # the ranger classpath. We should only need the test cluster configs on the classpath. unset CLASSPATH -. $IMPALA_HOME/bin/impala-config.sh +. $IMPALA_HOME/bin/impala-config.sh > /dev/null 2>&1 # Required to start Ranger with Java 11 if [[ ! -d "${RANGER_HOME}"/ews/logs ]]; then
