Skip to content

Commit 5c52e48

Browse files
committed
Updating spark-k8s dependency to hadoop 3.4.3
1 parent a1b64d5 commit 5c52e48

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

hadoop/hadoop/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ARG PROTOBUF_VERSION
1010
ARG AWS_JAVA_SDK_BUNDLE_VERSION
1111
ARG AZURE_STORAGE_VERSION
1212
ARG AZURE_KEYVAULT_CORE_VERSION
13+
ARG ANALYTICSACCELERATOR_S3_VERSION
1314
ARG STACKABLE_USER_UID
1415

1516
WORKDIR /stackable
@@ -166,6 +167,9 @@ else
166167
cp /stackable/hadoop/share/hadoop/common/lib/hadoop-aws-${NEW_VERSION}.jar /stackable/hadoop-cloud-libraries/
167168
# Starting with Hadoop 3.4.3 the aws-java-sdk-bundle is not included any more.
168169
curl -o /stackable/hadoop-cloud-libraries/aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar --fail "https://repo.stackable.tech/repository/packages/aws/aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar"
170+
# Starting with Hadoop 3.4.3 the S3A InputStreamType factory references analyticsaccelerator-s3 (software.amazon.s3.analyticsaccelerator.request.ObjectClient) during S3AFileSystem.initialize.
171+
# TODO: switch to https://repo.stackable.tech/repository/packages/aws/analyticsaccelerator-s3-${ANALYTICSACCELERATOR_S3_VERSION}.jar once mirrored.
172+
curl -o /stackable/hadoop-cloud-libraries/analyticsaccelerator-s3-${ANALYTICSACCELERATOR_S3_VERSION}.jar --fail "https://repo1.maven.org/maven2/software/amazon/s3/analyticsaccelerator/analyticsaccelerator-s3/${ANALYTICSACCELERATOR_S3_VERSION}/analyticsaccelerator-s3-${ANALYTICSACCELERATOR_S3_VERSION}.jar"
169173
cp /stackable/hadoop/share/hadoop/common/lib/hadoop-azure-${NEW_VERSION}.jar /stackable/hadoop-cloud-libraries/
170174
cp /stackable/hadoop/share/hadoop/common/lib/azure-storage-${AZURE_STORAGE_VERSION}.jar /stackable/hadoop-cloud-libraries/
171175
cp /stackable/hadoop/share/hadoop/common/lib/azure-keyvault-core-${AZURE_KEYVAULT_CORE_VERSION}.jar /stackable/hadoop-cloud-libraries/

hadoop/hadoop/boil-config.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ protobuf-version = "3.21.12" # https://github.com/apache/hadoop/blob/rel/release
3030
aws-java-sdk-bundle-version = "2.35.4" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.3
3131
azure-storage-version = "7.0.1" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.4.3
3232
azure-keyvault-core-version = "1.0.0" # Needs to match https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
33-
34-
33+
analyticsaccelerator-s3-version = "1.3.1" # Pinned in hadoop-project-3.4.3.pom via amazon-s3-analyticsaccelerator-s3.version.
3534

3635
[versions."3.5.0".local-images]
3736
java-devel = "17" # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions
@@ -42,3 +41,4 @@ protobuf-version = "3.25.5" # https://github.com/apache/hadoop/blob/rel/release-
4241
aws-java-sdk-bundle-version = "2.35.4" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.5.0
4342
azure-storage-version = "7.0.1" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.5.0
4443
azure-keyvault-core-version = "1.0.0" # Needs to match https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
44+
analyticsaccelerator-s3-version = "1.3.1" # Pinned in hadoop-project-3.5.0.pom via amazon-s3-analyticsaccelerator-s3.version.

spark-k8s/boil-config.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
containerfile = "Dockerfile.3"
77

88
[versions."3.5.8".local-images]
9-
"hadoop/hadoop" = "3.4.2" # TODO: Bump to 3.4.3
9+
"hadoop/hadoop" = "3.4.3"
1010
java-base = "17"
1111
java-devel = "17"
1212
hbase = "2.6.3"
@@ -27,7 +27,7 @@ hbase-connector-version = "1.0.1_3.5.8"
2727
containerfile = "Dockerfile.4"
2828

2929
[versions."4.1.1".local-images]
30-
"hadoop/hadoop" = "3.4.2" # TODO: Bump to 3.4.3
30+
"hadoop/hadoop" = "3.4.3"
3131
java-base = "21"
3232
java-devel = "21"
3333

0 commit comments

Comments
 (0)