hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jzh...@apache.org
Subject hadoop git commit: HADOOP-14184. Remove service loader config entry for ftp fs. Contributed by Sen Zhao.
Date Mon, 09 Oct 2017 07:34:53 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 6bd81ab05 -> 9676ed19b


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9676ed19
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9676ed19
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9676ed19

Branch: refs/heads/trunk
Commit: 9676ed19beb129443e7b25d525c359eca742f01a
Parents: 6bd81ab
Author: John Zhuge <jzhuge@apache.org>
Authored: Mon Oct 9 00:33:17 2017 -0700
Committer: John Zhuge <jzhuge@apache.org>
Committed: Mon Oct 9 00:33:17 2017 -0700

----------------------------------------------------------------------
 .../META-INF/services/org.apache.hadoop.fs.FileSystem          | 1 -
 .../hadoop-common/src/main/resources/core-default.xml          | 6 ++++++
 .../org/apache/hadoop/conf/TestCommonConfigurationFields.java  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9676ed19/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
----------------------------------------------------------------------
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 cbf2d6d..907ad3b 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9676ed19/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
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 291608c..e7ea10f 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
@@ -816,6 +816,12 @@
 </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>
   <name>fs.AbstractFileSystem.webhdfs.impl</name>
   <value>org.apache.hadoop.fs.WebHdfs</value>
   <description>The FileSystem for webhdfs: uris.</description>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9676ed19/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java
----------------------------------------------------------------------
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 864c10c..6677716 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");


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message