Skip to content

HDDS-8911. Update Hadoop to 3.3.6 #4985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 9 commits into from
Jun 27, 2023
Merged

HDDS-8911. Update Hadoop to 3.3.6 #4985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb928f9
Use docker image from official Apache Hadoop.
jojochuang Jun 12, 2023
1e8469e
Use apache/hadoop image if Hadoop is 3.3.x; otherwise use flokkr/hadoop.
jojochuang Jun 22, 2023
96d8f3d
Hack
jojochuang Jun 22, 2023
4c60699
Remove the hack. apache/hadoop has a 3.3.5 tagged image
jojochuang Jun 22, 2023
31caf5f
Update to Hadoop 3.3.6 RC0
jojochuang Jun 14, 2023
87d5022
Remove staging repository.
jojochuang Jun 22, 2023
21b09c1
Use apache/hadoop:3.3.6 image
jojochuang Jun 22, 2023
82a536f
Update more HADOOP_VERSIOn
jojochuang Jun 26, 2023
8ae7bcc
Manuall recorded jar-report and harmonized HADOOP_VERSION in docker e…
jojochuang Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ 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.5; do
for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.6; do
export HADOOP_VERSION
export HADOOP_MAJOR_VERSION=${HADOOP_VERSION%%.*}
# Check if $HADOOP_VERSION starts with the prefix "3.3."
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_VERSION=3
HADOOP_VERSION=${hadoop.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

HDDS_VERSION=${hdds.version}
HADOOP_IMAGE=apache/hadoop
HADOOP_VERSION=3.3.5
HADOOP_VERSION=${hadoop.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/compose/ozonesecure/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

HDDS_VERSION=${hdds.version}
HADOOP_VERSION=3
HADOOP_VERSION=${hadoop.version}
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_RUNNER_IMAGE=apache/ozone-runner
OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
Expand Down
3 changes: 0 additions & 3 deletions hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,6 @@ Apache License 2.0
jakarta.validation:jakarta.validation-api
javax.enterprise:cdi-api
javax.inject:javax.inject
net.minidev:accessors-smart
net.minidev:json-smart
net.java.dev.jna:jna
net.java.dev.jna:jna-platform
org.apache.commons:commons-compress
Expand Down Expand Up @@ -496,7 +494,6 @@ BSD 3-Clause
com.google.re2j:re2j
com.jcraft:jsch
com.thoughtworks.paranamer:paranamer
org.ow2.asm:asm


BSD 2-Clause
Expand Down
3 changes: 0 additions & 3 deletions hadoop-ozone/dist/src/main/license/jar-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
share/ozone/lib/accessors-smart.jar
share/ozone/lib/activation.jar
share/ozone/lib/animal-sniffer-annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/aopalliance.jar
share/ozone/lib/aopalliance-repackaged.jar
share/ozone/lib/asm.jar
share/ozone/lib/aspectjrt.jar
share/ozone/lib/aspectjweaver.jar
share/ozone/lib/awaitility.jar
Expand Down Expand Up @@ -156,7 +154,6 @@ share/ozone/lib/jooq.jar
share/ozone/lib/jooq-meta.jar
share/ozone/lib/jsch.jar
share/ozone/lib/json-simple.jar
share/ozone/lib/json-smart.jar
share/ozone/lib/jsp-api.jar
share/ozone/lib/jsr305.jar
share/ozone/lib/jsr311-api.jar
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/smoketest/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

HADOOP_VERSION=3
HADOOP_VERSION=${hadoop.version}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs

<properties>
<hadoop2.version>2.7.3</hadoop2.version>
<hadoop.version>3.3.5</hadoop.version>
<hadoop.version>3.3.6</hadoop.version>

<!-- version for hdds/ozone components -->
<hdds.version>${ozone.version}</hdds.version>
Expand Down