From 699f99f91cb29fc5f5ab32d82144c13998c214e3 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Date: Tue, 5 Nov 2024 16:02:41 +0100
Subject: [PATCH] chore(hadoop): Bump to hdfs-utils 0.4.0 (#914)

* WIP: Build hdfs-utils from feat/extended-request branch

* chore: Bump to hdfs-utils 0.4.0

* changelog

* fix: Fix compilation by compiling using Java 17
---
 CHANGELOG.md       |  2 ++
 hadoop/Dockerfile  | 19 +++++++++++++++----
 hadoop/versions.py |  6 +++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c257db5ee..93a278f7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ All notable changes to this project will be documented in this file.
 - ci: Bump `stackabletech/actions` to 0.2.0 ([#901], [#903], [#907], [#910], [#913]).
 - ubi-rust-builder: Bump Rust toolchain to 1.81.0 ([#902]).
 - ci: Handle release builds in the same build workflows ([#913]).
+- hadoop: Bump to `hdfs-utils` 0.4.0 ([#914]).
 
 ### Removed
 
@@ -99,6 +100,7 @@ All notable changes to this project will be documented in this file.
 [#910]: https://github.com/stackabletech/docker-images/pull/910
 [#912]: https://github.com/stackabletech/docker-images/pull/912
 [#913]: https://github.com/stackabletech/docker-images/pull/913
+[#914]: https://github.com/stackabletech/docker-images/pull/914
 
 ## [24.7.0] - 2024-07-24
 
diff --git a/hadoop/Dockerfile b/hadoop/Dockerfile
index 28e65634c..646147fe3 100644
--- a/hadoop/Dockerfile
+++ b/hadoop/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.10.0@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
 # check=error=true
 
-FROM stackable/image/java-devel AS builder
+FROM stackable/image/java-devel AS hadoop-builder
 
 ARG PRODUCT
 ARG ASYNC_PROFILER
@@ -95,6 +95,17 @@ ARG HDFS_UTILS
 ARG PRODUCT
 ARG STACKABLE_USER_UID
 
+# Starting with hdfs-utils 0.4.0 we need to use Java 17 for compilation.
+# We can not simply use java-devel with Java 17, as it is also used to compile Hadoop in this
+# Dockerfile, which needs Java 11. So we need to also use the java-devel image in version 11 and
+# install Java 17 ourselves.
+# The adptiom yum repo is already added by the java-devel Dockerfile.
+RUN microdnf update && \
+    microdnf install -y temurin-17-jdk && \
+    microdnf clean all && \
+    rm -rf /var/cache/yum
+ENV JAVA_HOME="/usr/lib/jvm/temurin-17-jdk"
+
 USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
@@ -125,9 +136,9 @@ LABEL name="Apache Hadoop" \
       summary="The Stackable image for Apache Hadoop." \
       description="This image is deployed by the Stackable Operator for Apache Hadoop / HDFS."
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/hadoop-${PRODUCT} /stackable/hadoop-${PRODUCT}/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/jmx /stackable/jmx/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/async-profiler /stackable/async-profiler/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${PRODUCT} /stackable/hadoop-${PRODUCT}/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/jmx /stackable/jmx/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/async-profiler /stackable/async-profiler/
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hadoop-${PRODUCT}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS}.jar /stackable/hadoop-${PRODUCT}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS}.jar
 COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/fuse_dfs_wrapper /stackable/
 
diff --git a/hadoop/versions.py b/hadoop/versions.py
index 93e4a3dab..8126e6434 100644
--- a/hadoop/versions.py
+++ b/hadoop/versions.py
@@ -6,7 +6,7 @@
         "async_profiler": "2.9",
         "jmx_exporter": "1.0.1",
         "protobuf": "3.7.1",
-        "hdfs_utils": "0.3.0",
+        "hdfs_utils": "0.4.0",
     },
     {
         "product": "3.3.6",
@@ -15,7 +15,7 @@
         "async_profiler": "2.9",
         "jmx_exporter": "1.0.1",
         "protobuf": "3.7.1",
-        "hdfs_utils": "0.3.0",
+        "hdfs_utils": "0.4.0",
     },
     {
         "product": "3.4.0",
@@ -24,6 +24,6 @@
         "async_profiler": "2.9",
         "jmx_exporter": "1.0.1",
         "protobuf": "3.7.1",
-        "hdfs_utils": "0.3.0",
+        "hdfs_utils": "0.4.0",
     },
 ]