This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new dc18d7bdff HDDS-9699. Upgrade Hadoop2 to latest 2.10.2 (#5609)
dc18d7bdff is described below
commit dc18d7bdff96d28b2acaf9314fbc009a0c538073
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Nov 22 20:12:43 2023 +0100
HDDS-9699. Upgrade Hadoop2 to latest 2.10.2 (#5609)
---
hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 8 +++-----
pom.xml | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
index 2bc717f7a0..4b66baca42 100755
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
@@ -19,9 +19,8 @@ extra_compose_file=hadoop.yaml
if [[ ${SECURITY_ENABLED} == "true" ]]; then
extra_compose_file=hadoop-secure.yaml
fi
-export
COMPOSE_FILE=${COMPOSE_FILE:-docker-compose.yaml}:../common/${extra_compose_file}
+export
COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yaml}":../common/${extra_compose_file}
-export COMPOSE_FILE
export HADOOP_MAJOR_VERSION=3
export HADOOP_VERSION=unused # will be set for each test version below
export OZONE_REPLICATION_FACTOR=3
@@ -43,11 +42,10 @@ export OZONE_DIR=/opt/ozone
# shellcheck source=/dev/null
source "$COMPOSE_DIR/../testlib.sh"
-for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.6; do
+for HADOOP_VERSION in ${hadoop2.version} 3.1.2 ${hadoop.version}; do
export HADOOP_VERSION
export HADOOP_MAJOR_VERSION=${HADOOP_VERSION%%.*}
- # Check if $HADOOP_VERSION starts with the prefix "3.3."
- if [[ $HADOOP_VERSION == 3.3.* ]]; then
+ if [[ "${HADOOP_VERSION}" == "${hadoop2.version}" ]] || [[
"${HADOOP_VERSION}" == "${hadoop.version}" ]]; then
export HADOOP_IMAGE=apache/hadoop
else
export HADOOP_IMAGE=flokkr/hadoop
diff --git a/pom.xml b/pom.xml
index d13de13975..3105bffc81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
</organization>
<properties>
- <hadoop2.version>2.7.3</hadoop2.version>
+ <hadoop2.version>2.10.2</hadoop2.version>
<hadoop.version>3.3.6</hadoop.version>
<!-- version for hdds/ozone components -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
