Author: wheat9
Date: Wed Apr 2 17:28:08 2014
New Revision: 1584100
URL: http://svn.apache.org/r1584100
Log:
HDFS-5570. Deprecate hftp / hsftp and replace them with webhdfs / swebhdfs.
Contributed by Haohui Mai.
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml?rev=1584100&r1=1584099&r2=1584100&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/job_1329348432655_0001_conf.xml
Wed Apr 2 17:28:08 2014
@@ -182,7 +182,6 @@
<property><!--Loaded from
job.xml--><name>file.stream-buffer-size</name><value>4096</value></property>
<property><!--Loaded from
job.xml--><name>dfs.namenode.fs-limits.max-directory-items</name><value>0</value></property>
<property><!--Loaded from
job.xml--><name>io.mapfile.bloom.size</name><value>1048576</value></property>
-<property><!--Loaded from
job.xml--><name>fs.hsftp.impl</name><value>org.apache.hadoop.hdfs.HsftpFileSystem</value></property>
<property><!--Loaded from
job.xml--><name>yarn.nodemanager.container-executor.class</name><value>org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor</value></property>
<property><!--Loaded from
job.xml--><name>mapreduce.map.maxattempts</name><value>4</value></property>
<property><!--Loaded from
job.xml--><name>mapreduce.jobtracker.jobhistory.block.size</name><value>3145728</value></property>
@@ -224,7 +223,6 @@
<property><!--Loaded from
job.xml--><name>hadoop.http.authentication.simple.anonymous.allowed</name><value>true</value></property>
<property><!--Loaded from
job.xml--><name>hadoop.rpc.socket.factory.class.default</name><value>org.apache.hadoop.net.StandardSocketFactory</value></property>
<property><!--Loaded from
job.xml--><name>mapreduce.job.submithostname</name><value>localhost</value></property>
-<property><!--Loaded from
job.xml--><name>fs.hftp.impl</name><value>org.apache.hadoop.hdfs.HftpFileSystem</value></property>
<property><!--Loaded from
job.xml--><name>dfs.namenode.handler.count</name><value>10</value></property>
<property><!--Loaded from
job.xml--><name>fs.automatic.close</name><value>true</value></property>
<property><!--Loaded from
job.xml--><name>fs.kfs.impl</name><value>org.apache.hadoop.fs.kfs.KosmosFileSystem</value></property>
@@ -392,6 +390,7 @@
<property><!--Loaded from
job.xml--><name>mapreduce.job.counters.limit</name><value>120</value></property>
<property><!--Loaded from
job.xml--><name>dfs.datanode.ipc.address</name><value>0.0.0.0:50020</value></property>
<property><!--Loaded from
job.xml--><name>fs.webhdfs.impl</name><value>org.apache.hadoop.hdfs.web.WebHdfsFileSystem</value></property>
+<property><!--Loaded from
job.xml--><name>fs.swebhdfs.impl</name><value>org.apache.hadoop.hdfs.web.SWebHdfsFileSystem</value></property>
<property><!--Loaded from
job.xml--><name>yarn.nodemanager.delete.debug-delay-sec</name><value>0</value></property>
<property><!--Loaded from
job.xml--><name>dfs.datanode.max.transfer.threads</name><value>4096</value></property>
</configuration>
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java?rev=1584100&r1=1584099&r2=1584100&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java
Wed Apr 2 17:28:08 2014
@@ -565,18 +565,6 @@ public class TestFileSystem extends Test
new Path("file:///").getFileSystem(conf);
FileSystem.closeAll();
}
-
- {
- Configuration conf = new Configuration();
- new Path("hftp://localhost:12345/";).getFileSystem(conf);
- FileSystem.closeAll();
- }
-
- {
- Configuration conf = new Configuration();
- FileSystem fs = new Path("hftp://localhost:12345/";).getFileSystem(conf);
- FileSystem.closeAll();
- }
}
public void testFsShutdownHook() throws Exception {
@@ -617,12 +605,12 @@ public class TestFileSystem extends Test
Configuration conf = new Configuration();
// check basic equality
- FileSystem.Cache.Key lowercaseCachekey1 = new FileSystem.Cache.Key(new
URI("hftp://localhost:12345/";), conf);
- FileSystem.Cache.Key lowercaseCachekey2 = new FileSystem.Cache.Key(new
URI("hftp://localhost:12345/";), conf);
+ FileSystem.Cache.Key lowercaseCachekey1 = new FileSystem.Cache.Key(new
URI("hdfs://localhost:12345/"), conf);
+ FileSystem.Cache.Key lowercaseCachekey2 = new FileSystem.Cache.Key(new
URI("hdfs://localhost:12345/"), conf);
assertEquals( lowercaseCachekey1, lowercaseCachekey2 );
// check insensitive equality
- FileSystem.Cache.Key uppercaseCachekey = new FileSystem.Cache.Key(new
URI("HFTP://Localhost:12345/"), conf);
+ FileSystem.Cache.Key uppercaseCachekey = new FileSystem.Cache.Key(new
URI("HDFS://Localhost:12345/"), conf);
assertEquals( lowercaseCachekey2, uppercaseCachekey );
// check behaviour with collections
