From 9676ed19beb129443e7b25d525c359eca742f01a Mon Sep 17 00:00:00 2001 From: John Zhuge Date: Mon, 9 Oct 2017 00:33:17 -0700 Subject: [PATCH] HADOOP-14184. Remove service loader config entry for ftp fs. Contributed by Sen Zhao. --- .../META-INF/services/org.apache.hadoop.fs.FileSystem | 1 - .../hadoop-common/src/main/resources/core-default.xml | 6 ++++++ .../apache/hadoop/conf/TestCommonConfigurationFields.java | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem b/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem index cbf2d6d0935..907ad3b0472 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem +++ b/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem @@ -15,7 +15,6 @@ org.apache.hadoop.fs.LocalFileSystem org.apache.hadoop.fs.viewfs.ViewFileSystem -org.apache.hadoop.fs.ftp.FTPFileSystem org.apache.hadoop.fs.HarFileSystem org.apache.hadoop.fs.http.HttpFileSystem org.apache.hadoop.fs.http.HttpsFileSystem diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml index 291608ca426..e7ea10f0cab 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -815,6 +815,12 @@ The FileSystem for Ftp: uris. + + fs.ftp.impl + org.apache.hadoop.fs.ftp.FTPFileSystem + The implementation class of the FTP FileSystem + + fs.AbstractFileSystem.webhdfs.impl org.apache.hadoop.fs.WebHdfs diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java index 864c10ce207..66777164013 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java @@ -99,6 +99,10 @@ public class TestCommonConfigurationFields extends TestConfigurationFieldsBase { // S3A properties are in a different subtree. xmlPrefixToSkipCompare.add("fs.s3a."); + //ftp properties are in a different subtree. + // - org.apache.hadoop.fs.ftp.FTPFileSystem. + xmlPrefixToSkipCompare.add("fs.ftp.impl"); + // WASB properties are in a different subtree. // - org.apache.hadoop.fs.azure.NativeAzureFileSystem xmlPrefixToSkipCompare.add("fs.wasb.impl");