Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HDDS-11956. Deprecate/remove Hadoop 2 support #7680

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions hadoop-hdds/docs/content/feature/Reconfigurability.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ Currently, only Datanode supports batch operations<br>
> $ `ozone admin reconfig --service=DATANODE --in-service-datanodes properties`<br>
Datanode: Node [hadoop1:19864] Reconfigurable properties:<br>
ozone.example.config<br>
Datanode: Node [hadoop2:19864] Reconfigurable properties:<br>
ozone.example.config<br>
adoroszlai marked this conversation as resolved.
Show resolved Hide resolved
Datanode: Node [hadoop3:19864] Reconfigurable properties:<br>
ozone.example.config<br>
Reconfig successfully 3 nodes, failure 0 nodes.<br>
2 changes: 0 additions & 2 deletions hadoop-hdds/docs/content/feature/Reconfigurability.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ ozone.example.config
> $ `ozone admin reconfig --service=DATANODE --in-service-datanodes properties`<br>
Datanode: Node [hadoop1:19864] Reconfigurable properties:<br>
ozone.example.config<br>
Datanode: Node [hadoop2:19864] Reconfigurable properties:<br>
ozone.example.config<br>
adoroszlai marked this conversation as resolved.
Show resolved Hide resolved
Datanode: Node [hadoop3:19864] Reconfigurable properties:<br>
ozone.example.config<br>
Reconfig successfully 3 nodes, failure 0 nodes.<br>
2 changes: 0 additions & 2 deletions hadoop-hdds/docs/content/interface/O3fs.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ You also need to add the ozone-filesystem-hadoop3.jar file to the classpath:
export HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
{{< /highlight >}}

(Note: with Hadoop 2.x, use the `ozone-filesystem-hadoop2-*.jar`)

Once the default Filesystem has been setup, users can run commands like ls, put, mkdir, etc.
For example,

Expand Down
4 changes: 0 additions & 4 deletions hadoop-hdds/docs/content/interface/O3fs.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ ozone sh bucket create /volume/bucket
export HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
{{< /highlight >}}

(注意:当使用Hadoop 2.x时,应该在classpath上添加ozone-filesystem-hadoop2-*.jar)

当配置了默认的文件系统之后,用户可以运行 ls、put、mkdir 等命令,比如:

{{< highlight bash >}}
Expand Down Expand Up @@ -148,8 +146,6 @@ hdfs dfs -ls o3fs://bucket.volume.om-host.example.com:6789/key
export HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
{{< /highlight >}}

(注意:当使用Hadoop 2.x时,应该在classpath上添加ozone-filesystem-hadoop2-*.jar)

当配置了默认的文件系统之后,用户可以运行 ls、put、mkdir 等命令,比如:

{{< highlight bash >}}
Expand Down
2 changes: 0 additions & 2 deletions hadoop-hdds/docs/content/interface/Ofs.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ You also need to add the ozone-filesystem-hadoop3.jar file to the classpath:
export HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
{{< /highlight >}}

(Note: with Hadoop 2.x, use the `ozone-filesystem-hadoop2-*.jar`)

Once the default Filesystem has been setup, users can run commands like ls, put, mkdir, etc.
For example:

Expand Down
2 changes: 0 additions & 2 deletions hadoop-hdds/docs/content/interface/Ofs.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ ofs://omservice/tmp/key1
export HADOOP_CLASSPATH=/opt/ozone/share/ozone/lib/ozone-filesystem-hadoop3-*.jar:$HADOOP_CLASSPATH
{{< /highlight >}}

(请注意: 在 Hadoop 2.x 中, 请使用 `ozone-filesystem-hadoop2-*.jar`)

当默认的文件系统被建立,用户可以运行命令例如ls,put,mkdir等。
例如:

Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dev-support/checks/coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ mkdir -p target/coverage-classes

#Unzip all the classes from the last build
find hadoop-ozone/dist/target/*/share/ozone/lib -name 'hdds-*.jar' -or -name 'ozone-*.jar' | \
grep -v -E 'shaded|hadoop2|hadoop3|tests' | \
grep -v -E 'shaded|hadoop3|tests' | \
xargs -n1 unzip -o -q -d target/coverage-classes

#Exclude some classes from the coverage
Expand Down
4 changes: 0 additions & 4 deletions hadoop-ozone/dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,6 @@
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-filesystem-hadoop2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-filesystem-hadoop3</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ export COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yaml}":../common/${extra_com
: ${HADOOP_TEST_IMAGES:=""}

if [[ -z "${HADOOP_TEST_IMAGES}" ]]; then
# hadoop2 and flokkr images are only available from Docker Hub
HADOOP_TEST_IMAGES="${HADOOP_TEST_IMAGES} apache/hadoop:${hadoop2.version}"
# flokkr images are only available from Docker Hub
HADOOP_TEST_IMAGES="${HADOOP_TEST_IMAGES} flokkr/hadoop:3.1.2"
HADOOP_TEST_IMAGES="${HADOOP_TEST_IMAGES} ${HADOOP_IMAGE}:${hadoop.version}"
fi
Expand Down
19 changes: 0 additions & 19 deletions hadoop-ozone/dist/src/main/compose/common/hadoop2.conf

This file was deleted.

1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/license/jar-report.txt
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ share/ozone/lib/ozone-common.jar
share/ozone/lib/ozone-csi.jar
share/ozone/lib/ozone-datanode.jar
share/ozone/lib/ozone-filesystem-common.jar
share/ozone/lib/ozone-filesystem-hadoop2.jar
share/ozone/lib/ozone-filesystem-hadoop3.jar
share/ozone/lib/ozone-filesystem.jar
share/ozone/lib/ozone-httpfsgateway.jar
Expand Down
161 changes: 0 additions & 161 deletions hadoop-ozone/ozonefs-hadoop2/pom.xml

This file was deleted.

This file was deleted.

Loading
Loading