From 11d57670c74cf7eb7d0b315d9ada98fcba18de12 Mon Sep 17 00:00:00 2001 From: Nick <10092581+NickLarsenNZ@users.noreply.github.com> Date: Fri, 21 Mar 2025 16:55:21 +0100 Subject: [PATCH 1/4] chore: Release 25.3.0-rc1 (#1035) Signed-off-by: Nick Larsen --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7de1a8a29..68742f440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [25.3.0-rc1] - 2025-03-21 + ### Added - omid: Added 1.1.3-SNAPSHOT to allow for easier scanning pre-release From 9a050834fb136692a28528f887c11f92bfe99ded Mon Sep 17 00:00:00 2001 From: Nick <10092581+NickLarsenNZ@users.noreply.github.com> Date: Tue, 25 Mar 2025 09:55:43 +0100 Subject: [PATCH 2/4] chore: Update changelog for 25.3.0 (#1036) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68742f440..2897fdb86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -## [25.3.0-rc1] - 2025-03-21 +## [25.3.0] - 2025-03-21 ### Added From 6b6a788c97d0e4e566e9b58e8027fc82cfe8144e Mon Sep 17 00:00:00 2001 From: Xenia Date: Fri, 4 Apr 2025 11:25:48 +0200 Subject: [PATCH 3/4] fix: Add `--locked` flag to cargo install commands (#1048) fix: Add `--locked` flag to cargo install commands (#1044) * fix: Add flag to cargo install commands * add changelog entry --- CHANGELOG.md | 6 ++++++ stackable-base/Dockerfile | 2 +- ubi8-rust-builder/Dockerfile | 2 +- ubi9-rust-builder/Dockerfile | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2897fdb86..725de03e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed + +- cherry-pick: Add `--locked` flag to `cargo install` commands for reproducible builds ([#1044]). + +[#1044]: https://github.com/stackabletech/docker-images/pull/1044 + ## [25.3.0] - 2025-03-21 ### Added diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile index 3109ef2b5..6735fd52d 100644 --- a/stackable-base/Dockerfile +++ b/stackable-base/Dockerfile @@ -36,7 +36,7 @@ rm -rf /var/cache/yum # WARNING (@NickLarsenNZ): We should pin the rustup version curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_DEFAULT_TOOLCHAIN_VERSION" -. "$HOME/.cargo/env" && cargo --quiet install cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION" +. "$HOME/.cargo/env" && cargo --quiet install --locked cargo-cyclonedx@"$CARGO_CYCLONEDX_CRATE_VERSION" cargo-auditable@"$CARGO_AUDITABLE_CRATE_VERSION" EOF FROM product-utils-builder AS config-utils diff --git a/ubi8-rust-builder/Dockerfile b/ubi8-rust-builder/Dockerfile index 27541b0af..0e74506da 100644 --- a/ubi8-rust-builder/Dockerfile +++ b/ubi8-rust-builder/Dockerfile @@ -80,7 +80,7 @@ WORKDIR / RUN < Date: Fri, 12 Jun 2026 12:01:13 +0100 Subject: [PATCH 4/4] Changes to build Hadoop with HDFS-17891 patch on 25.3 --- hadoop/Dockerfile | 6 +-- ...or-hostname-resolution-bug-with-data.patch | 48 +++++++++++++++++++ ...N-11873-Update-nodejs-to-LTS-version.patch | 22 +++++++++ 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 hadoop/stackable/patches/3.4.1/0006-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch create mode 100644 hadoop/stackable/patches/3.4.1/0007-YARN-11873-Update-nodejs-to-LTS-version.patch diff --git a/hadoop/Dockerfile b/hadoop/Dockerfile index acb4e0947..892d16b2a 100644 --- a/hadoop/Dockerfile +++ b/hadoop/Dockerfile @@ -172,9 +172,9 @@ rm -rf /stackable/hadoop/share/hadoop/tools/sources/ rm -rf /stackable/hadoop/share/hadoop/tools/lib/json-io-*.jar rm -rf /stackable/hadoop/share/hadoop/tools/lib/hadoop-mapreduce-client-*.jar rm -rf /stackable/hadoop/share/hadoop/tools/lib/hadoop-yarn-server*.jar -find . -name 'hadoop-minicluster-*.jar' -type f -delete -find . -name 'hadoop-client-minicluster-*.jar' -type f -delete -find . -name 'hadoop-*tests.jar' -type f -delete +find /stackable/hadoop -name 'hadoop-minicluster-*.jar' -type f -delete +find /stackable/hadoop -name 'hadoop-client-minicluster-*.jar' -type f -delete +find /stackable/hadoop -name 'hadoop-*tests.jar' -type f -delete # Without this fuse_dfs does not work # It is so non-root users (as we are) can mount a FUSE device and let other users access it diff --git a/hadoop/stackable/patches/3.4.1/0006-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch b/hadoop/stackable/patches/3.4.1/0006-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch new file mode 100644 index 000000000..49fcd1c26 --- /dev/null +++ b/hadoop/stackable/patches/3.4.1/0006-HDFS-17891-fix-for-hostname-resolution-bug-with-data.patch @@ -0,0 +1,48 @@ +From cb5487dcd3e6e170014604478a3d8cef03285007 Mon Sep 17 00:00:00 2001 +From: Jim Halfpenny +Date: Mon, 16 Mar 2026 09:18:46 +0000 +Subject: HDFS-17891 fix for hostname resolution bug with datanodes + +--- + .../hadoop/hdfs/server/blockmanagement/HostSet.java | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java +index d12e5fbae1..3da753f1cb 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java +@@ -18,10 +18,11 @@ + package org.apache.hadoop.hdfs.server.blockmanagement; + + +-import org.apache.hadoop.util.Preconditions; + import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap; + import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap; + import org.apache.hadoop.thirdparty.com.google.common.collect.UnmodifiableIterator; ++import org.slf4j.Logger; ++import org.slf4j.LoggerFactory; + + import java.net.InetAddress; + import java.net.InetSocketAddress; +@@ -38,6 +39,8 @@ + * .getPort() || B.getPort() == 0. + */ + public class HostSet implements Iterable { ++ private static final Logger LOG = LoggerFactory.getLogger(HostSet.class); ++ + // Host -> lists of ports + private final Multimap addrs = HashMultimap.create(); + +@@ -72,7 +75,11 @@ int size() { + } + + void add(InetSocketAddress addr) { +- Preconditions.checkArgument(!addr.isUnresolved()); ++ LOG.debug("Adding address to HostSet: {}", addr); ++ if (addr.isUnresolved()) { ++ LOG.warn("Unresolved address not added to HostSet: {}", addr); ++ return; ++ } + addrs.put(addr.getAddress(), addr.getPort()); + } + diff --git a/hadoop/stackable/patches/3.4.1/0007-YARN-11873-Update-nodejs-to-LTS-version.patch b/hadoop/stackable/patches/3.4.1/0007-YARN-11873-Update-nodejs-to-LTS-version.patch new file mode 100644 index 000000000..061535cb9 --- /dev/null +++ b/hadoop/stackable/patches/3.4.1/0007-YARN-11873-Update-nodejs-to-LTS-version.patch @@ -0,0 +1,22 @@ +From 140bab81c680be4f8a57c5c98ccf3daebd2f5528 Mon Sep 17 00:00:00 2001 +From: Andrew Kenworthy +Date: Wed, 1 Oct 2025 18:12:09 +0200 +Subject: YARN-11873-Update-nodejs-to-LTS-version + +--- + hadoop-project/pom.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml +index 2819592164..8785723b29 100644 +--- a/hadoop-project/pom.xml ++++ b/hadoop-project/pom.xml +@@ -217,7 +217,7 @@ + 1.0.2 + 5.4.0 + 9.37.2 +- v14.17.0 ++ v22.20.0 + v1.22.5 + 1.10.13 + 1.20