This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 44acf78 HDDS-4147. Add OFS to FileSystem META-INF (#1352)
44acf78 is described below
commit 44acf78aec6c3a4e1c5fea3a43971144c6da9a4c
Author: Siyao Meng <[email protected]>
AuthorDate: Fri Aug 28 09:15:15 2020 -0700
HDDS-4147. Add OFS to FileSystem META-INF (#1352)
---
hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozone/docker-config | 2 --
.../dist/src/main/compose/ozonesecure-om-ha/docker-config | 1 -
hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config | 2 --
.../resources/META-INF/services/org.apache.hadoop.fs.FileSystem | 1 +
.../org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 9 ++-------
.../hadoop/fs/ozone/contract/rooted/RootedOzoneContract.java | 7 +------
.../java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java | 3 +--
.../resources/META-INF/services/org.apache.hadoop.fs.FileSystem | 1 +
.../resources/META-INF/services/org.apache.hadoop.fs.FileSystem | 1 +
.../resources/META-INF/services/org.apache.hadoop.fs.FileSystem | 1 +
.../resources/META-INF/services/org.apache.hadoop.fs.FileSystem | 1 +
.../resources/META-INF/services/org.apache.hadoop.fs.FileSystem | 1 +
14 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
index b835147..4d47bf0 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
@@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CORE-SITE.XML_fs.o3fs.impl=org.apache.hadoop.fs.ozone.OzoneFileSystem
CORE-SITE.XML_fs.defaultFS=o3fs://bucket.volume.id1
OZONE-SITE.XML_ozone.om.service.ids=id1
OZONE-SITE.XML_ozone.om.nodes.id1=om1,om2,om3
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
index 4eb1c8a..008c684 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config
@@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CORE-SITE.XML_fs.o3fs.impl=org.apache.hadoop.fs.ozone.OzoneFileSystem
CORE-SITE.XML_fs.defaultFS=o3fs://bucket1.volume1.omservice
OZONE-SITE.XML_ozone.om.service.ids=omservice
OZONE-SITE.XML_ozone.om.nodes.omservice=om1,om2,om3
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone/docker-config
index 4d53acb..f100e82 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-config
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CORE-SITE.XML_fs.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
-CORE-SITE.XML_fs.o3fs.impl=org.apache.hadoop.fs.ozone.OzoneFileSystem
OZONE-SITE.XML_ozone.om.address=om
OZONE-SITE.XML_ozone.om.http-address=om:9874
OZONE-SITE.XML_ozone.scm.container.size=1GB
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-config
index e245b7e..c332448 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-om-ha/docker-config
@@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CORE-SITE.XML_fs.o3fs.impl=org.apache.hadoop.fs.ozone.OzoneFileSystem
CORE-SITE.XML_fs.defaultFS=o3fs://bucket.volume.id1
OZONE-SITE.XML_ozone.om.service.ids=id1
OZONE-SITE.XML_ozone.om.internal.service.id=id1
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
index abb3045..30e1816 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-CORE-SITE.XML_fs.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
-CORE-SITE.XML_fs.o3fs.impl=org.apache.hadoop.fs.ozone.OzoneFileSystem
OZONE-SITE.XML_ozone.om.volume.listall.allowed=false
OZONE-SITE.XML_ozone.om.address=om
diff --git
a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
index 0368002..e444f66 100644
---
a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
+++
b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.hadoop.fs.ozone.OzoneFileSystem
+org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
index cc316d0..b812b45 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
@@ -143,9 +143,7 @@ public class TestRootedOzoneFileSystem {
conf.set(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY, rootPath);
// Set the number of keys to be processed during batch operate.
conf.setInt(OZONE_FS_ITERATE_BATCH_SIZE, 5);
- // Note: FileSystem#loadFileSystems won't load OFS class due to META-INF
- // hence this workaround.
- conf.set("fs.ofs.impl",
"org.apache.hadoop.fs.ozone.RootedOzoneFileSystem");
+ // fs.ofs.impl would be loaded from META-INF, no need to manually set it
fs = FileSystem.get(conf);
trash = new Trash(conf);
ofs = (RootedOzoneFileSystem) fs;
@@ -163,10 +161,7 @@ public class TestRootedOzoneFileSystem {
@Test
public void testOzoneFsServiceLoader() throws IOException {
OzoneConfiguration confTestLoader = new OzoneConfiguration();
- // Note: FileSystem#loadFileSystems won't load OFS class due to META-INF
- // hence this workaround.
- confTestLoader.set("fs.ofs.impl",
- "org.apache.hadoop.fs.ozone.RootedOzoneFileSystem");
+ // fs.ofs.impl should be loaded from META-INF, no need to explicitly set it
Assert.assertEquals(FileSystem.getFileSystemClass(
OzoneConsts.OZONE_OFS_URI_SCHEME, confTestLoader),
RootedOzoneFileSystem.class);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/rooted/RootedOzoneContract.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/rooted/RootedOzoneContract.java
index c9f063b..9eb43a0 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/rooted/RootedOzoneContract.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/contract/rooted/RootedOzoneContract.java
@@ -99,12 +99,7 @@ class RootedOzoneContract extends AbstractFSContract {
OzoneConsts.OZONE_OFS_URI_SCHEME,
cluster.getOzoneManager().getRpcPort());
getConf().set("fs.defaultFS", uri);
-
- // Note: FileSystem#loadFileSystems doesn't load OFS class because
- // META-INF points to org.apache.hadoop.fs.ozone.OzoneFileSystem
- getConf().set("fs.ofs.impl",
- "org.apache.hadoop.fs.ozone.RootedOzoneFileSystem");
-
+ // fs.ofs.impl should be loaded from META-INF, no need to explicitly set it
copyClusterConfigs(OMConfigKeys.OZONE_OM_ADDRESS_KEY);
copyClusterConfigs(ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY);
return FileSystem.get(getConf());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
index 45258db..513049d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java
@@ -456,8 +456,7 @@ public class TestOzoneShellHA {
String hostPrefix, OzoneConfiguration configuration) {
OzoneConfiguration clientConf = new OzoneConfiguration(configuration);
- clientConf.set("fs.ofs.impl",
- "org.apache.hadoop.fs.ozone.RootedOzoneFileSystem");
+ // fs.ofs.impl should be loaded from META-INF, no need to explicitly set it
clientConf.set(FS_DEFAULT_NAME_KEY, hostPrefix);
clientConf.setInt(FS_TRASH_INTERVAL_KEY, 60);
return clientConf;
diff --git
a/hadoop-ozone/ozonefs-common/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
b/hadoop-ozone/ozonefs-common/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
index 0368002..e444f66 100644
---
a/hadoop-ozone/ozonefs-common/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
+++
b/hadoop-ozone/ozonefs-common/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.hadoop.fs.ozone.OzoneFileSystem
+org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
diff --git
a/hadoop-ozone/ozonefs-hadoop2/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
b/hadoop-ozone/ozonefs-hadoop2/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
index 0368002..e444f66 100644
---
a/hadoop-ozone/ozonefs-hadoop2/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
+++
b/hadoop-ozone/ozonefs-hadoop2/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.hadoop.fs.ozone.OzoneFileSystem
+org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
diff --git
a/hadoop-ozone/ozonefs-hadoop3/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
b/hadoop-ozone/ozonefs-hadoop3/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
index 0368002..e444f66 100644
---
a/hadoop-ozone/ozonefs-hadoop3/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
+++
b/hadoop-ozone/ozonefs-hadoop3/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.hadoop.fs.ozone.OzoneFileSystem
+org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
diff --git
a/hadoop-ozone/ozonefs/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
b/hadoop-ozone/ozonefs/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
index 0368002..e444f66 100644
---
a/hadoop-ozone/ozonefs/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
+++
b/hadoop-ozone/ozonefs/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.hadoop.fs.ozone.OzoneFileSystem
+org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
diff --git
a/hadoop-ozone/tools/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
b/hadoop-ozone/tools/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
index 0368002..e444f66 100644
---
a/hadoop-ozone/tools/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
+++
b/hadoop-ozone/tools/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.hadoop.fs.ozone.OzoneFileSystem
+org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
