gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hadoop: 3.4.1 -> 3.4.2, use jdk21

Browse Source 
- Update hadoop to 3.4.2
- Switch from jdk11 to jdk21
- Add support for lean variant builds
- Replace netstat with ss in tests
This commit is contained in:
illustris
2025-09-13 21:48:09 +05:30
parent 9f5adfabcc
commit c3c9b51017
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/hadoop/hadoop.nix
View File

@@ -238,7 +238,7 @@ import ../make-test-python.nix (
nn2.wait_for_open_port(9870) nn2.wait_for_open_port(9870)
nn2.wait_for_open_port(8022) nn2.wait_for_open_port(8022)
nn2.wait_for_open_port(8020) nn2.wait_for_open_port(8020)
nn1.succeed("systemd-cat netstat -tulpne") nn1.succeed("systemd-cat ss -tulpne")
# Start failover controllers # Start failover controllers
nn1.succeed("systemctl start hdfs-zkfc") nn1.succeed("systemctl start hdfs-zkfc")

19
pkgs/applications/networking/cluster/hadoop/default.nix
View File

@@ -6,6 +6,7 @@
autoPatchelfHook, autoPatchelfHook,
jdk8_headless, jdk8_headless,
jdk11_headless, jdk11_headless,
jdk21_headless,
bash, bash,
coreutils, coreutils,
which, which,
@@ -39,11 +40,15 @@ let
tests, tests,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
inherit pname jdk; inherit pname;
jdk = platformAttrs.${stdenv.system}.jdk or jdk;
version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}");
src = fetchurl { src = fetchurl {
url = url =
"mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}"
+
lib.optionalString (lib.hasAttr "variant" platformAttrs.${stdenv.system})
"-${platformAttrs.${stdenv.system}.variant}"
+ lib.optionalString stdenv.hostPlatform.isAarch64 "-aarch64" + lib.optionalString stdenv.hostPlatform.isAarch64 "-aarch64"
+ ".tar.gz"; + ".tar.gz";
inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"))
@@ -170,19 +175,21 @@ in
pname = "hadoop"; pname = "hadoop";
platformAttrs = rec { platformAttrs = rec {
x86_64-linux = { x86_64-linux = {
version = "3.4.1"; version = "3.4.2";
hash = "sha256-mtVIeDOZbf5VFOdW9DkQKckFKf0i6NAC/T3QwUwEukY="; hash = "sha256-YySoP+EeUXiQQ2/G2AvIKVBu0lLL4kZXUrkSIJAN+4M=";
srcHash = "sha256-lE9uSohy6GWXprFEYbEin2ITqTms2h6EWXe4nEd3U4Y="; srcHash = "sha256-AkZjpHk57S3pYiZambxgRHR7PD51HSI4H1HHW9ICah4=";
variant = "lean";
}; };
x86_64-darwin = x86_64-linux; x86_64-darwin = x86_64-linux;
aarch64-linux = x86_64-linux // { aarch64-linux = {
version = "3.4.0"; version = "3.4.0";
hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8="; hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8=";
srcHash = "sha256-viDF3LdRCZHqFycOYfN7nUQBPHiMCIjmu7jgIAaaK9E="; srcHash = "sha256-viDF3LdRCZHqFycOYfN7nUQBPHiMCIjmu7jgIAaaK9E=";
jdk = jdk11_headless;
}; };
aarch64-darwin = aarch64-linux; aarch64-darwin = aarch64-linux;
}; };
jdk = jdk11_headless; jdk = jdk21_headless;
# TODO: Package and add Intel Storage Acceleration Library # TODO: Package and add Intel Storage Acceleration Library
tests = nixosTests.hadoop; tests = nixosTests.hadoop;
}; };