From eb928f95df7269877c0a9e6f73c9de03b237bf91 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Mon, 12 Jun 2023 16:22:44 -0700 Subject: [PATCH 1/9] Use docker image from official Apache Hadoop. Change-Id: I934094457b8d98ace07cf4c3f43abdd59d49e929 Update Change-Id: Icc5e52f3c0f6a42c65b0b1817e4d26555320a5b3 Fix Change-Id: I5a8c10896172ed9ac2346824aa2d9141c31520dc Revert "Fix" This reverts commit 4a1ceeb4e3f6290feccb15d378f5b9ab8ad507d3. Revert "Update" This reverts commit 83dce5c2cd6baad6b92f981d4758cb0e24932667. Update Change-Id: I37ad5774d0b88f436693348b0f785fa0f293ac65 Old Hadoop versions, use flokkr/hadoop image. Hadoop 3.3 line, use apache/hadoop image. Change-Id: Id70d316c3672efdc7f7452e19d9ab887b62a3ec7 --- hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh | 2 ++ hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh b/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh index 40a12b85e195..63362b9639a4 100755 --- a/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh +++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh @@ -23,5 +23,7 @@ export COMPOSE_DIR export SECURITY_ENABLED=false export SCM=scm1 export OM_SERVICE_ID=omservice +export HADOOP_VERSION=3.2.2 +export HADOOP_IMAGE=flokkr/hadoop source "$COMPOSE_DIR/../common/hadoop-test.sh" diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh b/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh index e687fac5ada3..d845abd96be3 100755 --- a/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh +++ b/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh @@ -22,5 +22,7 @@ export COMPOSE_DIR export SECURITY_ENABLED=false export SCM=scm +export HADOOP_VERSION=3.1.2 +export HADOOP_IMAGE=flokkr/hadoop source "$COMPOSE_DIR/../common/hadoop-test.sh" From 1e8469e3bfcf5df7bbf1fc2e2b23f19b36aef879 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Thu, 22 Jun 2023 08:52:42 -0700 Subject: [PATCH 2/9] Use apache/hadoop image if Hadoop is 3.3.x; otherwise use flokkr/hadoop. Change-Id: Iad17f2776c003ea3d049aa8e4ce412d23e84bbf0 --- hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh | 2 -- hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh b/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh index 63362b9639a4..40a12b85e195 100755 --- a/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh +++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh @@ -23,7 +23,5 @@ export COMPOSE_DIR export SECURITY_ENABLED=false export SCM=scm1 export OM_SERVICE_ID=omservice -export HADOOP_VERSION=3.2.2 -export HADOOP_IMAGE=flokkr/hadoop source "$COMPOSE_DIR/../common/hadoop-test.sh" diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh b/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh index d845abd96be3..e687fac5ada3 100755 --- a/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh +++ b/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh @@ -22,7 +22,5 @@ export COMPOSE_DIR export SECURITY_ENABLED=false export SCM=scm -export HADOOP_VERSION=3.1.2 -export HADOOP_IMAGE=flokkr/hadoop source "$COMPOSE_DIR/../common/hadoop-test.sh" From 96d8f3d95c9a49ea10d74f8b9cafd1511646a7f0 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Thu, 22 Jun 2023 09:44:09 -0700 Subject: [PATCH 3/9] Hack Change-Id: Ic1665c2e99304602d0f2964b31858f585a6a2b62 --- hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 2 ++ 1 file changed, 2 insertions(+) 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 3f96c13980a4..5ca8c150b0a9 100755 --- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh +++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh @@ -39,6 +39,8 @@ for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.5; do # Check if $HADOOP_VERSION starts with the prefix "3.3." if [[ $HADOOP_VERSION == 3.3.* ]]; then export HADOOP_IMAGE=apache/hadoop + # Hack. apache/hadoop does not tag the specific image release version. + export HADOOP_VERSION=3 else export HADOOP_IMAGE=flokkr/hadoop fi From 4c60699c705540dd08f5814f033c6a9cbf9d5f25 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Thu, 22 Jun 2023 11:43:18 -0700 Subject: [PATCH 4/9] Remove the hack. apache/hadoop has a 3.3.5 tagged image Change-Id: I6f0429e83c8b0dddcb59fd45f7e18fc691eaf3ea --- hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 2 -- 1 file changed, 2 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 5ca8c150b0a9..3f96c13980a4 100755 --- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh +++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh @@ -39,8 +39,6 @@ for HADOOP_VERSION in 2.7.3 3.1.2 3.2.2 3.3.5; do # Check if $HADOOP_VERSION starts with the prefix "3.3." if [[ $HADOOP_VERSION == 3.3.* ]]; then export HADOOP_IMAGE=apache/hadoop - # Hack. apache/hadoop does not tag the specific image release version. - export HADOOP_VERSION=3 else export HADOOP_IMAGE=flokkr/hadoop fi From 31caf5fbd492f679f60c86d8222fd43b2ae7d8cb Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Wed, 14 Jun 2023 15:51:15 -0700 Subject: [PATCH 5/9] Update to Hadoop 3.3.6 RC0 Change-Id: I7689a84e01ff69b6978b79245fd8a58ecf66e34a (cherry picked from commit 4835638ee361ca122125d31ee7abcce38cfce35e) --- .../dist/src/main/license/bin/LICENSE.txt | 3 -- .../dist/src/main/license/jar-report.txt | 45 +++++++++---------- pom.xml | 17 ++++++- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index d02c3bcceb1f..ab39f190b6a5 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -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 @@ -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 diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index d54591b4a936..1d0edb2c65a7 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -1,11 +1,10 @@ -share/ozone/lib/accessors-smart.jar +share/ozone/lib/FastInfoset.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/aopalliance.jar share/ozone/lib/aspectjrt.jar share/ozone/lib/aspectjweaver.jar share/ozone/lib/awaitility.jar @@ -26,8 +25,8 @@ share/ozone/lib/commons-configuration2.jar share/ozone/lib/commons-daemon.jar share/ozone/lib/commons-digester.jar share/ozone/lib/commons-io.jar -share/ozone/lib/commons-lang3.jar share/ozone/lib/commons-lang.jar +share/ozone/lib/commons-lang3.jar share/ozone/lib/commons-logging.jar share/ozone/lib/commons-net.jar share/ozone/lib/commons-pool2.jar @@ -41,21 +40,20 @@ share/ozone/lib/disruptor.jar share/ozone/lib/dnsjava.jar share/ozone/lib/error_prone_annotations.jar share/ozone/lib/failureaccess.jar -share/ozone/lib/FastInfoset.jar share/ozone/lib/gethostname4j.jar share/ozone/lib/grpc-api.jar share/ozone/lib/grpc-context.jar share/ozone/lib/grpc-core.jar share/ozone/lib/grpc-netty.jar -share/ozone/lib/grpc-protobuf.jar share/ozone/lib/grpc-protobuf-lite.jar +share/ozone/lib/grpc-protobuf.jar share/ozone/lib/grpc-stub.jar share/ozone/lib/gson.jar share/ozone/lib/guava-jre.jar share/ozone/lib/guice-assistedinject.jar share/ozone/lib/guice-bridge.jar -share/ozone/lib/guice.jar share/ozone/lib/guice-servlet.jar +share/ozone/lib/guice.jar share/ozone/lib/hadoop-annotations.jar share/ozone/lib/hadoop-auth.jar share/ozone/lib/hadoop-common.jar @@ -76,8 +74,8 @@ share/ozone/lib/hdds-hadoop-dependency-server.jar share/ozone/lib/hdds-interface-admin.jar share/ozone/lib/hdds-interface-client.jar share/ozone/lib/hdds-interface-server.jar -share/ozone/lib/hdds-rocks-native.jar share/ozone/lib/hdds-managed-rocksdb.jar +share/ozone/lib/hdds-rocks-native.jar share/ozone/lib/hdds-server-framework.jar share/ozone/lib/hdds-server-scm.jar share/ozone/lib/hdds-tools.jar @@ -87,8 +85,8 @@ share/ozone/lib/hk2-utils.jar share/ozone/lib/hppc.jar share/ozone/lib/httpasyncclient.jar share/ozone/lib/httpclient.jar -share/ozone/lib/httpcore.jar share/ozone/lib/httpcore-nio.jar +share/ozone/lib/httpcore.jar share/ozone/lib/httpmime.jar share/ozone/lib/ion-java.jar share/ozone/lib/istack-commons-runtime.jar @@ -148,15 +146,14 @@ share/ozone/lib/jetty-util.jar share/ozone/lib/jetty-webapp.jar share/ozone/lib/jetty-xml.jar share/ozone/lib/jmespath-java.jar -share/ozone/lib/jna.jar share/ozone/lib/jna-platform.jar +share/ozone/lib/jna.jar share/ozone/lib/joda-time.jar share/ozone/lib/jooq-codegen.jar -share/ozone/lib/jooq.jar share/ozone/lib/jooq-meta.jar +share/ozone/lib/jooq.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 @@ -173,13 +170,13 @@ share/ozone/lib/log4j-core.jar share/ozone/lib/metainf-services.jar share/ozone/lib/metrics-core.jar share/ozone/lib/netty-buffer.Final.jar -share/ozone/lib/netty-codec.Final.jar -share/ozone/lib/netty-codec-http2.Final.jar share/ozone/lib/netty-codec-http.Final.jar +share/ozone/lib/netty-codec-http2.Final.jar share/ozone/lib/netty-codec-socks.Final.jar +share/ozone/lib/netty-codec.Final.jar share/ozone/lib/netty-common.Final.jar -share/ozone/lib/netty-handler.Final.jar share/ozone/lib/netty-handler-proxy.Final.jar +share/ozone/lib/netty-handler.Final.jar share/ozone/lib/netty-resolver.Final.jar share/ozone/lib/netty-tcnative-boringssl-static.Final-linux-aarch_64.jar share/ozone/lib/netty-tcnative-boringssl-static.Final-linux-x86_64.jar @@ -188,10 +185,10 @@ share/ozone/lib/netty-tcnative-boringssl-static.Final-osx-x86_64.jar share/ozone/lib/netty-tcnative-boringssl-static.Final-windows-x86_64.jar share/ozone/lib/netty-tcnative-boringssl-static.Final.jar share/ozone/lib/netty-tcnative-classes.Final.jar -share/ozone/lib/netty-transport.Final.jar share/ozone/lib/netty-transport-classes-epoll.Final.jar share/ozone/lib/netty-transport-native-epoll.Final-linux-x86_64.jar share/ozone/lib/netty-transport-native-unix-common.Final.jar +share/ozone/lib/netty-transport.Final.jar share/ozone/lib/nimbus-jose-jwt.jar share/ozone/lib/okhttp.jar share/ozone/lib/okio.jar @@ -207,25 +204,25 @@ share/ozone/lib/ozone-csi.jar share/ozone/lib/ozone-datanode.jar share/ozone/lib/ozone-filesystem-common.jar share/ozone/lib/ozone-filesystem-hadoop2.jar +share/ozone/lib/ozone-filesystem-hadoop3-client.jar share/ozone/lib/ozone-filesystem-hadoop3.jar share/ozone/lib/ozone-filesystem.jar share/ozone/lib/ozone-httpfsgateway.jar -share/ozone/lib/ozone-filesystem-hadoop3-client.jar share/ozone/lib/ozone-insight.jar share/ozone/lib/ozone-interface-client.jar share/ozone/lib/ozone-interface-storage.jar share/ozone/lib/ozone-manager.jar -share/ozone/lib/ozone-reconcodegen.jar share/ozone/lib/ozone-recon.jar +share/ozone/lib/ozone-reconcodegen.jar share/ozone/lib/ozone-s3-secret-store.jar share/ozone/lib/ozone-s3gateway.jar share/ozone/lib/ozone-tools.jar share/ozone/lib/perfmark-api.jar share/ozone/lib/picocli.jar +share/ozone/lib/proto-google-common-protos.jar +share/ozone/lib/protobuf-java-util.jar share/ozone/lib/protobuf-java.jar share/ozone/lib/protobuf-java.jar -share/ozone/lib/protobuf-java-util.jar -share/ozone/lib/proto-google-common-protos.jar share/ozone/lib/ranger-intg.jar share/ozone/lib/ranger-plugin-classloader.jar share/ozone/lib/ranger-plugins-audit.jar @@ -243,12 +240,12 @@ share/ozone/lib/ratis-thirdparty-misc.jar share/ozone/lib/ratis-tools.jar share/ozone/lib/re2j.jar share/ozone/lib/reflections.jar -share/ozone/lib/rocksdb-checkpoint-differ.jar share/ozone/lib/reload4j.jar +share/ozone/lib/rocksdb-checkpoint-differ.jar share/ozone/lib/rocksdbjni.jar +share/ozone/lib/simpleclient.jar share/ozone/lib/simpleclient_common.jar share/ozone/lib/simpleclient_dropwizard.jar -share/ozone/lib/simpleclient.jar share/ozone/lib/slf4j-api.jar share/ozone/lib/slf4j-reload4j.jar share/ozone/lib/snakeyaml.jar @@ -258,12 +255,12 @@ share/ozone/lib/spring-core.jar share/ozone/lib/spring-jdbc.jar share/ozone/lib/spring-tx.jar share/ozone/lib/sqlite-jdbc.jar -share/ozone/lib/stax2-api.jar share/ozone/lib/stax-ex.jar +share/ozone/lib/stax2-api.jar share/ozone/lib/txw2.jar share/ozone/lib/vault-java-driver.jar share/ozone/lib/weld-servlet-shaded.Final.jar share/ozone/lib/woodstox-core.jar -share/ozone/lib/zookeeper.jar share/ozone/lib/zookeeper-jute.jar +share/ozone/lib/zookeeper.jar share/ozone/lib/zstd-jni.jar diff --git a/pom.xml b/pom.xml index 0d8e0c7153ef..2f72c0c763bb 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.7.3 - 3.3.5 + 3.3.6 ${ozone.version} @@ -2026,6 +2026,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs + + + hadoop336rc0 + + yes + + + + hadoop336rc0 + Hadoop 3.3.6 RC0 repository + https://repository.apache.org/content/repositories/orgapachehadoop-1378 + + + + dist From 87d5022d03970316ce02c329cb0bf5a83ac58624 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Thu, 22 Jun 2023 13:35:28 -0700 Subject: [PATCH 6/9] Remove staging repository. Change-Id: Ieccbc62f0c3b454a6654419582ba87600678537a --- pom.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pom.xml b/pom.xml index 2f72c0c763bb..459c4547c2a8 100644 --- a/pom.xml +++ b/pom.xml @@ -2026,21 +2026,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs - - - hadoop336rc0 - - yes - - - - hadoop336rc0 - Hadoop 3.3.6 RC0 repository - https://repository.apache.org/content/repositories/orgapachehadoop-1378 - - - - dist From 21b09c11a73a9922bf754e9a97aa47d50f60e088 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Thu, 22 Jun 2023 13:36:33 -0700 Subject: [PATCH 7/9] Use apache/hadoop:3.3.6 image Change-Id: I44b49d761bddc195cf75889722ef70aab4837e6f --- hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 2 +- hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env | 2 +- 2 files changed, 2 insertions(+), 2 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 3f96c13980a4..b55a1a97edf0 100755 --- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh +++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh @@ -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." diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env index 83b68887a91f..5b3938e82f3e 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env @@ -16,7 +16,7 @@ HDDS_VERSION=${hdds.version} HADOOP_IMAGE=apache/hadoop -HADOOP_VERSION=3.3.5 +HADOOP_VERSION=3.3.6 OZONE_RUNNER_VERSION=${docker.ozone-runner.version} OZONE_RUNNER_IMAGE=apache/ozone-runner OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image} From 82a536f3a6cddec6036c8640203cdc4b7750732c Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Mon, 26 Jun 2023 12:59:30 -0700 Subject: [PATCH 8/9] Update more HADOOP_VERSIOn Change-Id: Ie71a16c738fa2d7118d4a8966fccb736d3087424 --- hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env | 2 +- hadoop-ozone/dist/src/main/compose/ozonesecure/.env | 2 +- hadoop-ozone/dist/src/main/smoketest/.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env index 1ddd45333e1a..63a182f24277 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env @@ -15,7 +15,7 @@ # limitations under the License. HDDS_VERSION=${hdds.version} -HADOOP_VERSION=3 +HADOOP_VERSION=3.3.6 OZONE_RUNNER_VERSION=${docker.ozone-runner.version} OZONE_RUNNER_IMAGE=apache/ozone-runner OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image} diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure/.env index 1ddd45333e1a..63a182f24277 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/.env +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/.env @@ -15,7 +15,7 @@ # limitations under the License. HDDS_VERSION=${hdds.version} -HADOOP_VERSION=3 +HADOOP_VERSION=3.3.6 OZONE_RUNNER_VERSION=${docker.ozone-runner.version} OZONE_RUNNER_IMAGE=apache/ozone-runner OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image} diff --git a/hadoop-ozone/dist/src/main/smoketest/.env b/hadoop-ozone/dist/src/main/smoketest/.env index 47a25e1ce8a4..93458be1b800 100644 --- a/hadoop-ozone/dist/src/main/smoketest/.env +++ b/hadoop-ozone/dist/src/main/smoketest/.env @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -HADOOP_VERSION=3 \ No newline at end of file +HADOOP_VERSION=3.3.6 \ No newline at end of file From 8ae7bcc11f84df76764cafeb798a15b9fb579af1 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Tue, 27 Jun 2023 07:59:58 -0700 Subject: [PATCH 9/9] Manuall recorded jar-report and harmonized HADOOP_VERSION in docker environment variables. Change-Id: Iab6db08da7e99a9e2799b916bbd2fb3a51010aa6 --- .../dist/src/main/compose/ozonesecure-ha/.env | 2 +- .../dist/src/main/compose/ozonesecure-mr/.env | 2 +- .../dist/src/main/compose/ozonesecure/.env | 2 +- .../dist/src/main/license/jar-report.txt | 42 +++++++++---------- hadoop-ozone/dist/src/main/smoketest/.env | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env index 63a182f24277..5f3e96ed617c 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/.env @@ -15,7 +15,7 @@ # limitations under the License. HDDS_VERSION=${hdds.version} -HADOOP_VERSION=3.3.6 +HADOOP_VERSION=${hadoop.version} OZONE_RUNNER_VERSION=${docker.ozone-runner.version} OZONE_RUNNER_IMAGE=apache/ozone-runner OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image} diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env index 5b3938e82f3e..c3a2c5329aa2 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env @@ -16,7 +16,7 @@ HDDS_VERSION=${hdds.version} HADOOP_IMAGE=apache/hadoop -HADOOP_VERSION=3.3.6 +HADOOP_VERSION=${hadoop.version} OZONE_RUNNER_VERSION=${docker.ozone-runner.version} OZONE_RUNNER_IMAGE=apache/ozone-runner OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image} diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure/.env index 63a182f24277..5f3e96ed617c 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/.env +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/.env @@ -15,7 +15,7 @@ # limitations under the License. HDDS_VERSION=${hdds.version} -HADOOP_VERSION=3.3.6 +HADOOP_VERSION=${hadoop.version} OZONE_RUNNER_VERSION=${docker.ozone-runner.version} OZONE_RUNNER_IMAGE=apache/ozone-runner OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image} diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index 1d0edb2c65a7..9cb4a2c3f358 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -1,10 +1,9 @@ -share/ozone/lib/FastInfoset.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-repackaged.jar share/ozone/lib/aopalliance.jar +share/ozone/lib/aopalliance-repackaged.jar share/ozone/lib/aspectjrt.jar share/ozone/lib/aspectjweaver.jar share/ozone/lib/awaitility.jar @@ -25,8 +24,8 @@ share/ozone/lib/commons-configuration2.jar share/ozone/lib/commons-daemon.jar share/ozone/lib/commons-digester.jar share/ozone/lib/commons-io.jar -share/ozone/lib/commons-lang.jar share/ozone/lib/commons-lang3.jar +share/ozone/lib/commons-lang.jar share/ozone/lib/commons-logging.jar share/ozone/lib/commons-net.jar share/ozone/lib/commons-pool2.jar @@ -40,20 +39,21 @@ share/ozone/lib/disruptor.jar share/ozone/lib/dnsjava.jar share/ozone/lib/error_prone_annotations.jar share/ozone/lib/failureaccess.jar +share/ozone/lib/FastInfoset.jar share/ozone/lib/gethostname4j.jar share/ozone/lib/grpc-api.jar share/ozone/lib/grpc-context.jar share/ozone/lib/grpc-core.jar share/ozone/lib/grpc-netty.jar -share/ozone/lib/grpc-protobuf-lite.jar share/ozone/lib/grpc-protobuf.jar +share/ozone/lib/grpc-protobuf-lite.jar share/ozone/lib/grpc-stub.jar share/ozone/lib/gson.jar share/ozone/lib/guava-jre.jar share/ozone/lib/guice-assistedinject.jar share/ozone/lib/guice-bridge.jar -share/ozone/lib/guice-servlet.jar share/ozone/lib/guice.jar +share/ozone/lib/guice-servlet.jar share/ozone/lib/hadoop-annotations.jar share/ozone/lib/hadoop-auth.jar share/ozone/lib/hadoop-common.jar @@ -74,8 +74,8 @@ share/ozone/lib/hdds-hadoop-dependency-server.jar share/ozone/lib/hdds-interface-admin.jar share/ozone/lib/hdds-interface-client.jar share/ozone/lib/hdds-interface-server.jar -share/ozone/lib/hdds-managed-rocksdb.jar share/ozone/lib/hdds-rocks-native.jar +share/ozone/lib/hdds-managed-rocksdb.jar share/ozone/lib/hdds-server-framework.jar share/ozone/lib/hdds-server-scm.jar share/ozone/lib/hdds-tools.jar @@ -85,8 +85,8 @@ share/ozone/lib/hk2-utils.jar share/ozone/lib/hppc.jar share/ozone/lib/httpasyncclient.jar share/ozone/lib/httpclient.jar -share/ozone/lib/httpcore-nio.jar share/ozone/lib/httpcore.jar +share/ozone/lib/httpcore-nio.jar share/ozone/lib/httpmime.jar share/ozone/lib/ion-java.jar share/ozone/lib/istack-commons-runtime.jar @@ -146,12 +146,12 @@ share/ozone/lib/jetty-util.jar share/ozone/lib/jetty-webapp.jar share/ozone/lib/jetty-xml.jar share/ozone/lib/jmespath-java.jar -share/ozone/lib/jna-platform.jar share/ozone/lib/jna.jar +share/ozone/lib/jna-platform.jar share/ozone/lib/joda-time.jar share/ozone/lib/jooq-codegen.jar -share/ozone/lib/jooq-meta.jar 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/jsp-api.jar @@ -170,13 +170,13 @@ share/ozone/lib/log4j-core.jar share/ozone/lib/metainf-services.jar share/ozone/lib/metrics-core.jar share/ozone/lib/netty-buffer.Final.jar -share/ozone/lib/netty-codec-http.Final.jar +share/ozone/lib/netty-codec.Final.jar share/ozone/lib/netty-codec-http2.Final.jar +share/ozone/lib/netty-codec-http.Final.jar share/ozone/lib/netty-codec-socks.Final.jar -share/ozone/lib/netty-codec.Final.jar share/ozone/lib/netty-common.Final.jar -share/ozone/lib/netty-handler-proxy.Final.jar share/ozone/lib/netty-handler.Final.jar +share/ozone/lib/netty-handler-proxy.Final.jar share/ozone/lib/netty-resolver.Final.jar share/ozone/lib/netty-tcnative-boringssl-static.Final-linux-aarch_64.jar share/ozone/lib/netty-tcnative-boringssl-static.Final-linux-x86_64.jar @@ -185,10 +185,10 @@ share/ozone/lib/netty-tcnative-boringssl-static.Final-osx-x86_64.jar share/ozone/lib/netty-tcnative-boringssl-static.Final-windows-x86_64.jar share/ozone/lib/netty-tcnative-boringssl-static.Final.jar share/ozone/lib/netty-tcnative-classes.Final.jar +share/ozone/lib/netty-transport.Final.jar share/ozone/lib/netty-transport-classes-epoll.Final.jar share/ozone/lib/netty-transport-native-epoll.Final-linux-x86_64.jar share/ozone/lib/netty-transport-native-unix-common.Final.jar -share/ozone/lib/netty-transport.Final.jar share/ozone/lib/nimbus-jose-jwt.jar share/ozone/lib/okhttp.jar share/ozone/lib/okio.jar @@ -204,25 +204,25 @@ share/ozone/lib/ozone-csi.jar share/ozone/lib/ozone-datanode.jar share/ozone/lib/ozone-filesystem-common.jar share/ozone/lib/ozone-filesystem-hadoop2.jar -share/ozone/lib/ozone-filesystem-hadoop3-client.jar share/ozone/lib/ozone-filesystem-hadoop3.jar share/ozone/lib/ozone-filesystem.jar share/ozone/lib/ozone-httpfsgateway.jar +share/ozone/lib/ozone-filesystem-hadoop3-client.jar share/ozone/lib/ozone-insight.jar share/ozone/lib/ozone-interface-client.jar share/ozone/lib/ozone-interface-storage.jar share/ozone/lib/ozone-manager.jar -share/ozone/lib/ozone-recon.jar share/ozone/lib/ozone-reconcodegen.jar +share/ozone/lib/ozone-recon.jar share/ozone/lib/ozone-s3-secret-store.jar share/ozone/lib/ozone-s3gateway.jar share/ozone/lib/ozone-tools.jar share/ozone/lib/perfmark-api.jar share/ozone/lib/picocli.jar -share/ozone/lib/proto-google-common-protos.jar -share/ozone/lib/protobuf-java-util.jar share/ozone/lib/protobuf-java.jar share/ozone/lib/protobuf-java.jar +share/ozone/lib/protobuf-java-util.jar +share/ozone/lib/proto-google-common-protos.jar share/ozone/lib/ranger-intg.jar share/ozone/lib/ranger-plugin-classloader.jar share/ozone/lib/ranger-plugins-audit.jar @@ -240,12 +240,12 @@ share/ozone/lib/ratis-thirdparty-misc.jar share/ozone/lib/ratis-tools.jar share/ozone/lib/re2j.jar share/ozone/lib/reflections.jar -share/ozone/lib/reload4j.jar share/ozone/lib/rocksdb-checkpoint-differ.jar +share/ozone/lib/reload4j.jar share/ozone/lib/rocksdbjni.jar -share/ozone/lib/simpleclient.jar share/ozone/lib/simpleclient_common.jar share/ozone/lib/simpleclient_dropwizard.jar +share/ozone/lib/simpleclient.jar share/ozone/lib/slf4j-api.jar share/ozone/lib/slf4j-reload4j.jar share/ozone/lib/snakeyaml.jar @@ -255,12 +255,12 @@ share/ozone/lib/spring-core.jar share/ozone/lib/spring-jdbc.jar share/ozone/lib/spring-tx.jar share/ozone/lib/sqlite-jdbc.jar -share/ozone/lib/stax-ex.jar share/ozone/lib/stax2-api.jar +share/ozone/lib/stax-ex.jar share/ozone/lib/txw2.jar share/ozone/lib/vault-java-driver.jar share/ozone/lib/weld-servlet-shaded.Final.jar share/ozone/lib/woodstox-core.jar -share/ozone/lib/zookeeper-jute.jar share/ozone/lib/zookeeper.jar +share/ozone/lib/zookeeper-jute.jar share/ozone/lib/zstd-jni.jar diff --git a/hadoop-ozone/dist/src/main/smoketest/.env b/hadoop-ozone/dist/src/main/smoketest/.env index 93458be1b800..c7c8e574e840 100644 --- a/hadoop-ozone/dist/src/main/smoketest/.env +++ b/hadoop-ozone/dist/src/main/smoketest/.env @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -HADOOP_VERSION=3.3.6 \ No newline at end of file +HADOOP_VERSION=${hadoop.version} \ No newline at end of file