Skip to content

Commit e075628

Browse files
authored
Merge branch 'apache:trunk' into HADOOP-19638
2 parents f8e7496 + 7063d58 commit e075628

File tree

387 files changed

+18493
-6724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

387 files changed

+18493
-6724
lines changed

.github/workflows/stale.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: Close stale PRs
21+
on:
22+
schedule:
23+
- cron: "0 0 * * *"
24+
25+
jobs:
26+
stale:
27+
if: github.repository == 'apache/hadoop'
28+
runs-on: ubuntu-latest
29+
steps:
30+
- uses: actions/stale@v1
31+
with:
32+
repo-token: ${{ secrets.GITHUB_TOKEN }}
33+
stale-pr-message: >
34+
We're closing this stale PR because it has been open for 100 days with
35+
no activity. This isn't a judgement on the merit of the PR in any way.
36+
It's just a way of keeping the PR queue manageable.
37+
38+
If you feel like this was a mistake, or you would like to continue
39+
working on it, please feel free to re-open it and ask for a committer to
40+
remove the stale tag and review again.
41+
42+
Thanks all for your contribution.
43+
days-before-stale: 100
44+
days-before-close: 0
45+
close-pr-label: 'stale'

BUILDING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ On Linux / Mac:
3131

3232
$ ./start-build-env.sh [OS platform]
3333

34-
- [OS Platform] One of [rockylinux_8, debian_10, ubuntu_20, ubuntu_24, windows_10].
34+
- [OS Platform] One of [rockylinux_8, debian_11, ubuntu_20, ubuntu_24, windows_10].
3535
Default is 'ubuntu_20'.
3636
Note: Currently only default ('ubuntu_20') is supported on arm machine
3737

LICENSE-binary

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,25 @@ com.fasterxml.woodstox:woodstox-core:5.4.0
229229
com.github.ben-manes.caffeine:caffeine:2.9.3
230230
com.github.davidmoten:rxjava-extras:0.8.0.17
231231
com.github.stephenc.jcip:jcip-annotations:1.0-1
232+
com.google.api:api-common:2.47.2
233+
com.google.api-client:google-api-client:2.7.2
234+
com.google.api:gax:2.64.2
235+
com.google.api:gax-grpc:2.64.2
236+
com.google.api:gax-httpjson:2.64.2
237+
com.google.api.grpc:gapic-google-cloud-storage-v2:2.52.0
238+
com.google.api.grpc:grpc-google-cloud-storage-v2:2.52.0
239+
com.google.api.grpc:proto-google-cloud-monitoring-v3:3.52.0
240+
com.google.api.grpc:proto-google-cloud-storage-v2:2.52.0
241+
com.google.api.grpc:proto-google-common-protos:2.55.2
242+
com.google.api.grpc:proto-google-iam-v1:1.50.2
243+
com.google.apis:google-api-services-storage:v1-rev20250420-2.0.0
244+
com.google.auto.value:auto-value-annotations:1.11.0
245+
com.google.cloud:google-cloud-core-grpc:2.54.2
246+
com.google.cloud:google-cloud-core-http:2.54.2
247+
com.google.cloud:google-cloud-core:2.54.2
248+
com.google.cloud:google-cloud-monitoring:3.52.0
249+
com.google.cloud.opentelemetry:exporter-metrics:0.33.0
250+
com.google.errorprone:error_prone_annotations:2.36.0
232251
com.google:guice:5.1.0
233252
com.google:guice-servlet:5.1.0
234253
com.google.api.grpc:proto-google-common-protos:1.0.0
@@ -237,9 +256,18 @@ com.google.errorprone:error_prone_annotations:2.5.1
237256
com.google.j2objc:j2objc-annotations:1.3
238257
com.google.json-simple:json-simple:1.1.1
239258
com.google.guava:failureaccess:1.0
259+
com.google.guava:failureaccess:1.0.2
240260
com.google.guava:guava:20.0
241261
com.google.guava:guava:32.0.1-jre
262+
com.google.guava:guava:33.1.0-jre
242263
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
264+
com.google.http-client:google-http-client-apache-v2:1.46.3
265+
com.google.http-client:google-http-client-appengine:1.46.3
266+
com.google.http-client:google-http-client-gson:1.46.3
267+
com.google.http-client:google-http-client-jackson2:1.46.3
268+
com.google.http-client:google-http-client:1.46.3
269+
com.google.j2objc:j2objc-annotations:3.0.0
270+
com.google.oauth-client:google-oauth-client:1.37.0
243271
com.microsoft.azure:azure-storage:7.0.0
244272
com.nimbusds:nimbus-jose-jwt:9.37.2
245273
com.zaxxer:HikariCP:4.0.3
@@ -251,13 +279,29 @@ commons-daemon:commons-daemon:1.0.13
251279
commons-io:commons-io:2.16.1
252280
commons-net:commons-net:3.9.0
253281
de.ruedigermoeller:fst:2.50
282+
io.grpc:grpc-alts:1.70.0
254283
io.grpc:grpc-api:1.69.0
284+
io.grpc:grpc-api:1.70.0
285+
io.grpc:grpc-auth:1.70.0
255286
io.grpc:grpc-context:1.69.0
287+
io.grpc:grpc-context:1.70.0
256288
io.grpc:grpc-core:1.69.0
289+
io.grpc:grpc-core:1.70.0
290+
io.grpc:grpc-googleapis:1.70.0
291+
io.grpc:grpc-grpclb:1.70.0
292+
io.grpc:grpc-inprocess:1.70.0
257293
io.grpc:grpc-netty:1.69.0
294+
io.grpc:grpc-netty-shaded:1.70.0
295+
io.grpc:grpc-opentelemetry:1.70.0
258296
io.grpc:grpc-protobuf:1.69.0
297+
io.grpc:grpc-protobuf:1.70.0
259298
io.grpc:grpc-protobuf-lite:1.69.0
299+
io.grpc:grpc-rls:1.70.0
300+
io.grpc:grpc-services:1.70.0
260301
io.grpc:grpc-stub:1.69.0
302+
io.grpc:grpc-stub:1.70.0
303+
io.grpc:grpc-util:1.70.0
304+
io.grpc:grpc-xds:1.70.0
261305
io.netty:netty-all:4.1.118.Final
262306
io.netty:netty-buffer:4.1.118.Final
263307
io.netty:netty-codec:4.1.118.Final
@@ -289,7 +333,19 @@ io.netty:netty-transport-native-epoll:4.1.118.Final
289333
io.netty:netty-transport-native-kqueue:4.1.118.Final
290334
io.netty:netty-resolver-dns-native-macos:4.1.118.Final
291335
io.opencensus:opencensus-api:0.12.3
336+
io.opencensus:opencensus-api:0.31.1
292337
io.opencensus:opencensus-contrib-grpc-metrics:0.12.3
338+
io.opencensus:opencensus-contrib-http-util:0.31.1
339+
io.opentelemetry.contrib:opentelemetry-gcp-resources:1.37.0-alpha
340+
io.opentelemetry:opentelemetry-api:1.47.0
341+
io.opentelemetry:opentelemetry-context:1.47.0
342+
io.opentelemetry:opentelemetry-sdk-common:1.47.0
343+
io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.47.0
344+
io.opentelemetry:opentelemetry-sdk:1.47.0
345+
io.opentelemetry:opentelemetry-sdk-logs:1.47.0
346+
io.opentelemetry:opentelemetry-sdk-metrics:1.47.0
347+
io.opentelemetry:opentelemetry-sdk-trace:1.47.0
348+
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha
293349
io.reactivex:rxjava:1.3.8
294350
io.reactivex:rxjava-string:1.1.1
295351
io.reactivex:rxnetty:0.4.20
@@ -340,6 +396,7 @@ org.apache.solr:solr-solrj:8.11.2
340396
org.apache.yetus:audience-annotations:0.5.0
341397
org.apache.zookeeper:zookeeper:3.8.4
342398
org.codehaus.jettison:jettison:1.5.4
399+
org.conscrypt:conscrypt-openjdk-uber:2.5.2
343400
org.eclipse.jetty:jetty-annotations:9.4.57.v20241219
344401
org.eclipse.jetty:jetty-http:9.4.57.v20241219
345402
org.eclipse.jetty:jetty-io:9.4.57.v20241219
@@ -394,18 +451,22 @@ hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
394451
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-3.5.17.min.js
395452
leveldb v1.13
396453

454+
com.google.auth:google-auth-library-credentials:1.33.1
455+
com.google.auth:google-auth-library-oauth2-http:1.33.1
397456
com.google.protobuf:protobuf-java:2.5.0
398457
com.google.protobuf:protobuf-java:3.25.5
399458
com.google.re2j:re2j:1.1
400459
com.jcraft:jsch:0.1.55
401460
com.thoughtworks.paranamer:paranamer:2.3
402461
jakarta.activation:jakarta.activation-api:1.2.1
462+
org.checkerframework:checker-qual:3.49.0
403463
org.fusesource.leveldbjni:leveldbjni-all:1.8
404464
org.jline:jline:3.9.0
405465
org.hamcrest:hamcrest-core:1.3
406466
org.ow2.asm:asm:5.0.4
407467
org.ow2.asm:asm-commons:6.0
408468
org.ow2.asm:asm-tree:6.0
469+
org.threeten:threetenbp:1.7.0
409470

410471

411472
MIT License
@@ -510,6 +571,7 @@ Eclipse Distribution License (EDL) 1.0
510571
--------------------------
511572

512573
jakarta.xml.bind:jakarta.xml.bind-api:2.3.3
574+
org.glassfish.jaxb:jaxb-runtime:2.3.9
513575

514576
Eclipse Public License 1.0
515577
--------------------------

dev-support/Jenkinsfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ pipeline {
9191
'''
9292
}
9393

94-
dir("${WORKSPACE}/debian-10") {
94+
dir("${WORKSPACE}/debian-11") {
9595
sh '''#!/usr/bin/env bash
9696
97-
cp -Rp ${WORKSPACE}/src ${WORKSPACE}/debian-10
97+
cp -Rp ${WORKSPACE}/src ${WORKSPACE}/debian-11
9898
'''
9999
}
100100

@@ -157,12 +157,12 @@ pipeline {
157157
// C++/C++ build/platform.
158158
// This stage serves as a means of cross platform validation, which is
159159
// really needed to ensure that any C++ related/platform change doesn't
160-
// break the Hadoop build on Debian 10.
161-
stage ('precommit-run Debian 10') {
160+
// break the Hadoop build on Debian 11.
161+
stage ('precommit-run Debian 11') {
162162
environment {
163-
SOURCEDIR = "${WORKSPACE}/debian-10/src"
164-
PATCHDIR = "${WORKSPACE}/debian-10/out"
165-
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_debian_10"
163+
SOURCEDIR = "${WORKSPACE}/debian-11/src"
164+
PATCHDIR = "${WORKSPACE}/debian-11/out"
165+
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_debian_11"
166166
IS_OPTIONAL = 1
167167
}
168168

@@ -182,7 +182,7 @@ pipeline {
182182
failure {
183183
sh '''#!/usr/bin/env bash
184184
185-
cp -Rp "${WORKSPACE}/debian-10/out" "${WORKSPACE}"
185+
cp -Rp "${WORKSPACE}/debian-11/out" "${WORKSPACE}"
186186
'''
187187
archiveArtifacts "out/**"
188188
}

dev-support/docker/Dockerfile_debian_10 renamed to dev-support/docker/Dockerfile_debian_11

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Dockerfile for installing the necessary dependencies for building Hadoop.
1818
# See BUILDING.txt.
1919

20-
FROM debian:10
20+
FROM debian:11
2121

2222
WORKDIR /root
2323

@@ -29,65 +29,63 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2929
RUN echo APT::Install-Recommends "0"\; > /etc/apt/apt.conf.d/10disableextras
3030
RUN echo APT::Install-Suggests "0"\; >> /etc/apt/apt.conf.d/10disableextras
3131

32-
ENV DEBIAN_FRONTEND noninteractive
33-
ENV DEBCONF_TERSE true
32+
ENV DEBIAN_FRONTEND=noninteractive
33+
ENV DEBCONF_TERSE=true
3434

3535
######
3636
# Platform package dependency resolver
3737
######
3838
COPY pkg-resolver pkg-resolver
3939
RUN chmod a+x pkg-resolver/install-pkg-resolver.sh
40-
RUN pkg-resolver/install-pkg-resolver.sh debian:10
40+
RUN pkg-resolver/install-pkg-resolver.sh debian:11
4141

4242
######
4343
# Install packages from apt
4444
######
4545
# hadolint ignore=DL3008,SC2046
4646
RUN apt-get -q update \
47-
&& apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py debian:10) \
48-
&& echo 'deb http://deb.debian.org/debian bullseye main' >> /etc/apt/sources.list \
49-
&& apt-get -q update \
50-
&& apt-get -q install -y --no-install-recommends -t bullseye $(pkg-resolver/resolve.py --release=bullseye debian:10) \
47+
&& apt-get -q install -y --no-install-recommends $(pkg-resolver/resolve.py debian:11) \
5148
&& apt-get clean \
49+
&& update-java-alternatives -s java-1.11.0-openjdk-amd64 \
5250
&& rm -rf /var/lib/apt/lists/*
5351

5452
# TODO : Set locale
5553

5654
######
5755
# Set env vars required to build Hadoop
5856
######
59-
ENV MAVEN_HOME /usr
57+
ENV MAVEN_HOME=/usr
6058
# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
61-
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
59+
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
6260

6361
#######
6462
# Set env vars for SpotBugs 4.2.2
6563
#######
66-
ENV SPOTBUGS_HOME /opt/spotbugs
64+
ENV SPOTBUGS_HOME=/opt/spotbugs
6765

6866
#######
6967
# Set env vars for Google Protobuf 3.21.12
7068
#######
71-
ENV PROTOBUF_HOME /opt/protobuf
72-
ENV PATH "${PATH}:/opt/protobuf/bin"
69+
ENV PROTOBUF_HOME=/opt/protobuf
70+
ENV PATH="${PATH}:/opt/protobuf/bin"
7371

7472
###
7573
# Avoid out of memory errors in builds
7674
###
77-
ENV MAVEN_OPTS -Xms256m -Xmx3072m
75+
ENV MAVEN_OPTS="-Xms256m -Xmx3072m"
7876

7977
# Skip gpg verification when downloading Yetus via yetus-wrapper
80-
ENV HADOOP_SKIP_YETUS_VERIFICATION true
78+
ENV HADOOP_SKIP_YETUS_VERIFICATION=true
8179

8280
####
8381
# Install packages
8482
####
85-
RUN pkg-resolver/install-cmake.sh debian:10
86-
RUN pkg-resolver/install-spotbugs.sh debian:10
87-
RUN pkg-resolver/install-boost.sh debian:10
88-
RUN pkg-resolver/install-protobuf.sh debian:10
89-
RUN pkg-resolver/install-hadolint.sh debian:10
90-
RUN pkg-resolver/install-intel-isa-l.sh debian:10
83+
RUN pkg-resolver/install-cmake.sh debian:11
84+
RUN pkg-resolver/install-spotbugs.sh debian:11
85+
RUN pkg-resolver/install-boost.sh debian:11
86+
RUN pkg-resolver/install-protobuf.sh debian:11
87+
RUN pkg-resolver/install-hadolint.sh debian:11
88+
RUN pkg-resolver/install-intel-isa-l.sh debian:11
9189

9290
###
9391
# Everything past this point is either not needed for testing or breaks Yetus.

dev-support/docker/Dockerfile_rockylinux_8

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ COPY pkg-resolver pkg-resolver
3030
RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \
3131
&& chmod a+r pkg-resolver/*.json
3232

33+
####
34+
# Install EPEL
35+
####
36+
RUN pkg-resolver/install-epel.sh rockylinux:8
37+
3338
######
3439
# Install packages from yum
3540
######
@@ -38,11 +43,6 @@ RUN yum update -y \
3843
&& yum install -y python3 \
3944
&& yum install -y $(pkg-resolver/resolve.py rockylinux:8)
4045

41-
####
42-
# Install EPEL
43-
####
44-
RUN pkg-resolver/install-epel.sh rockylinux:8
45-
4646
RUN dnf --enablerepo=powertools install -y \
4747
doxygen \
4848
snappy-devel \

dev-support/docker/pkg-resolver/install-pkg-resolver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
chmod a+x pkg-resolver/*.sh pkg-resolver/*.py
2525
chmod a+r pkg-resolver/*.json
2626

27-
if [ "$1" == "debian:10" ]; then
27+
if [ "$1" == "debian:11" ]; then
2828
apt-get -q update
2929
apt-get -q install -y --no-install-recommends python3 \
3030
python3-pip \

0 commit comments

Comments
 (0)