Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14184. Remove service loader config entry for ftp fs. Contributed by Sen Zhao.

This commit is contained in:
John Zhuge 2017-10-09 00:33:17 -07:00
parent 6bd81ab054
commit 9676ed19be
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
View File

@ -15,7 +15,6 @@
org.apache.hadoop.fs.LocalFileSystem org.apache.hadoop.fs.LocalFileSystem
org.apache.hadoop.fs.viewfs.ViewFileSystem org.apache.hadoop.fs.viewfs.ViewFileSystem
org.apache.hadoop.fs.ftp.FTPFileSystem
org.apache.hadoop.fs.HarFileSystem org.apache.hadoop.fs.HarFileSystem
org.apache.hadoop.fs.http.HttpFileSystem org.apache.hadoop.fs.http.HttpFileSystem
org.apache.hadoop.fs.http.HttpsFileSystem org.apache.hadoop.fs.http.HttpsFileSystem

6
hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
View File

@ -815,6 +815,12 @@
<description>The FileSystem for Ftp: uris.</description> <description>The FileSystem for Ftp: uris.</description>
</property> </property>
<property>
<name>fs.ftp.impl</name>
<value>org.apache.hadoop.fs.ftp.FTPFileSystem</value>
<description>The implementation class of the FTP FileSystem</description>
</property>
<property> <property>
<name>fs.AbstractFileSystem.webhdfs.impl</name> <name>fs.AbstractFileSystem.webhdfs.impl</name>
<value>org.apache.hadoop.fs.WebHdfs</value> <value>org.apache.hadoop.fs.WebHdfs</value>

4
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java
View File

@ -99,6 +99,10 @@ public class TestCommonConfigurationFields extends TestConfigurationFieldsBase {
// S3A properties are in a different subtree. // S3A properties are in a different subtree.
xmlPrefixToSkipCompare.add("fs.s3a."); 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. // WASB properties are in a different subtree.
// - org.apache.hadoop.fs.azure.NativeAzureFileSystem // - org.apache.hadoop.fs.azure.NativeAzureFileSystem
xmlPrefixToSkipCompare.add("fs.wasb.impl"); xmlPrefixToSkipCompare.add("fs.wasb.impl");