Skip to content

Commit

Permalink
Revert "Upgrade Ozone ufs to 1.0.0 version"
Browse files Browse the repository at this point in the history
This reverts commit 118769b to fix
Alluxio#12338

otherwise, maven build may stuck in shading

Cherry-pick of existing commit.
orig-pr-link: Alluxio#12337
orig-commit: Alluxio/alluxio@c1e07c5
orig-commit-author: Bin Fan <[email protected]>

pr-link: n/a
change-id: cid-64f10e66696d1241496852cbd51ceddf5f1d1a2d
  • Loading branch information
apc999 authored and alluxio-bot committed Oct 17, 2020
1 parent 222ff0d commit 3f892b5
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 205 deletions.
10 changes: 5 additions & 5 deletions docs/cn/ufs/Ozone.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Ozone可以在容器化环境(例如Kubernetes和YARN)中有效运行。
具有正确的Hadoop版本(推荐)),或
[从Alluxio源代码编译二进制文件]({{ '/en/contributor/Building-Alluxio-From-Source.html' | relativize_url}})(适用于高级用户)。

在准备Ozone与Alluxio一起使用时,请遵循[Ozone本地安装](https://hadoop.apache.org/ozone/docs/1.0.0/start/onprem.html)
安装Ozone集群,并遵循[卷命令](https://hadoop.apache.org/ozone/docs/1.0.0/shell/volumecommands.html)
[桶命令](https://hadoop.apache.org/ozone/docs/1.0.0/shell/bucketcommands.html)创建Ozone集群的卷和存储桶。
在准备Ozone与Alluxio一起使用时,请遵循[Ozone本地安装](https://hadoop.apache.org/ozone/docs/0.5.0-beta/start/onprem.html)
安装Ozone集群,并遵循[卷命令](https://hadoop.apache.org/ozone/docs/0.5.0-beta/shell/volumecommands.html)
[桶命令](https://hadoop.apache.org/ozone /docs/0.5.0-beta/shell/bucketcommands.html)创建Ozone集群的卷和存储桶。

## 基本设置

Expand Down Expand Up @@ -101,7 +101,7 @@ $ ./bin/alluxio fs mount \
```xml
<configuration>
<property>
<name>ozone.om.address</name>
<name>ozone.scm.names</name>
<value>localhost</value>
</property>
<property>
Expand Down Expand Up @@ -131,4 +131,4 @@ $ ./bin/alluxio fs mount \

### 支持的Ozone版本

当前,唯一经过与Alluxio测试Ozone版本是`1.0.0`
当前,唯一经过与Alluxio测试Ozone版本是`0.5.0-beta`
10 changes: 5 additions & 5 deletions docs/en/ufs/Ozone.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ machines. You can either [download the precompiled binaries directly]({{ '/en/de
with the correct Hadoop version (recommended), or
[compile the binaries from Alluxio source code]({{ '/en/contributor/Building-Alluxio-From-Source.html' | relativize_url }}) (for advanced users).

In preparation for using Ozone with Alluxio, follow the [Ozone On Premise Installation](https://hadoop.apache.org/ozone/docs/1.0.0/start/onprem.html)
to install a Ozone cluster, and follow the [Volume Commands](https://hadoop.apache.org/ozone/docs/1.0.0/shell/volumecommands.html) and
[Bucket Commands](https://hadoop.apache.org/ozone/docs/1.0.0/shell/bucketcommands.html) to create volume and bucket for Ozone cluster.
In preparation for using Ozone with Alluxio, follow the [Ozone On Premise Installation](https://hadoop.apache.org/ozone/docs/0.5.0-beta/start/onprem.html)
to install a Ozone cluster, and follow the [Volume Commands](https://hadoop.apache.org/ozone/docs/0.5.0-beta/shell/volumecommands.html) and
[Bucket Commands](https://hadoop.apache.org/ozone/docs/0.5.0-beta/shell/bucketcommands.html) to create volume and bucket for Ozone cluster.

## Basic Setup

Expand Down Expand Up @@ -105,7 +105,7 @@ Possible `core-site.xml` and `ozone-site.xml`
```xml
<configuration>
<property>
<name>ozone.om.address</name>
<name>ozone.scm.names</name>
<value>localhost</value>
</property>
<property>
Expand Down Expand Up @@ -135,4 +135,4 @@ Make sure the related config file is on all servers nodes running Alluxio.

### Supported Ozone Versions

Currently, the only tested Ozone version with Alluxio is `1.0.0`.
Currently, the only tested Ozone version with Alluxio is `0.5.0-beta`.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<ratis.version>1.0.0</ratis.version>
<slf4j.version>1.7.30</slf4j.version>
<jackson.version>2.11.1</jackson.version>
<ozone.version>1.0.0</ozone.version>
<ozone.version>0.5.0-beta</ozone.version>
<surefire.forkCount>2</surefire.forkCount>
<surefire.useSystemClassLoader>true</surefire.useSystemClassLoader>
<surefire.excludesFile>slow-tests</surefire.excludesFile>
Expand Down
189 changes: 0 additions & 189 deletions shaded/ozone/pom.xml

This file was deleted.

1 change: 0 additions & 1 deletion shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<modules>
<module>client</module>
<module>hadoop</module>
<module>ozone</module>
</modules>

<properties>
Expand Down
10 changes: 6 additions & 4 deletions underfs/ozone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@
<!-- The following paths need to be defined here as well as in the parent pom so that mvn can -->
<!-- run properly from sub-project directories -->
<build.path>${project.parent.parent.basedir}/build</build.path>
<ufs.ozone.version>1.0.0</ufs.ozone.version>
</properties>

<dependencies>
<!-- External dependencies -->
<dependency>
<groupId>org.alluxio</groupId>
<artifactId>alluxio-shaded-ozone</artifactId>
<version>${ufs.ozone.version}</version>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-filesystem</artifactId>
</dependency>
<!-- Internal dependencies -->
<dependency>
Expand Down

0 comments on commit 3f892b5

Please sign in to comment.