jprdonnelly/impala
1
0
Fork 0
mirror of https://github.com/apache/impala.git synced 2025-12-25 02:03:09 -05:00
Code Issues Projects Releases Wiki Activity

IMPALA-14187: (Addendum) Maintain consistent IMPALA_JAVA_TARGET

Browse Source 
impala-config-java.sh (evaluated through impala-config.sh) can be
sourced twice: buildall.sh and run-all-tests.sh. When TEST_JDK_VERSION
or TEST_JAVA_HOME_OVERRIDE is set, run-all-tests.sh can reinitialize
IMPALA_JAVA_TARGET with different value than what it was during
buildall.sh.

This patch makes IMPALA_JAVA_TARGET consistent both during build and
test by restoring IMPALA_JAVA_TARGET to its original value at
run-all-tests.sh.

This patch assumes that TEST_JDK_VERSION or TEST_JAVA_HOME_OVERRIDE (if
set) is greater version than IMPALA_JDK_VERSION, but does not validate
it.

Testing:
Pass all FE test with IMPALA_JDK_VERSION=8 and TEST_JDK_VERSION=17.

Change-Id: Ia1e9d09ac086ea66a5f17ff1c0932f27ac5d5567
Reviewed-on: http://gerrit.cloudera.org:8080/23115
Reviewed-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
This commit is contained in:
Riza Suminto
2025-07-02 18:18:17 -07:00
committed by Impala Public Jenkins
parent 37edc15dd6
commit 3089b91870
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/run-all-tests.sh
View File

@@ -33,6 +33,9 @@ setup_report_build_error
KERB_ARGS=""
# Use a different JDK for testing. Picked up by impala-config and start-impala-cluster.
# Preserve build-time IMPALA_JAVA_TARGET to restore to its original value in
# run-all-tests.sh later, because sourcing impala-config.sh below might override it.
: ${IMPALA_JAVA_TARGET_AT_BUILD:=${IMPALA_JAVA_TARGET}}
if [ ! -z "${TEST_JAVA_HOME_OVERRIDE:-}" ]; then
export MINICLUSTER_JAVA_HOME="${JAVA_HOME}"
export IMPALA_JAVA_HOME_OVERRIDE="${TEST_JAVA_HOME_OVERRIDE}"
@@ -42,6 +45,10 @@ elif [ ! -z "${TEST_JDK_VERSION:-}" ]; then
fi
. "${IMPALA_HOME}/bin/impala-config.sh" > /dev/null 2>&1
if [[ -n "${IMPALA_JAVA_TARGET_AT_BUILD}" ]]; then
export IMPALA_JAVA_TARGET=${IMPALA_JAVA_TARGET_AT_BUILD}
echo "Restore IMPALA_JAVA_TARGET to ${IMPALA_JAVA_TARGET}"
fi
. "${IMPALA_HOME}/testdata/bin/run-step.sh"
if "${CLUSTER_DIR}/admin" is_kerberized; then
KERB_ARGS="--use_kerberos"