Author: wang
Date: Thu Oct 17 22:08:09 2013
New Revision: 1533273
URL: http://svn.apache.org/r1533273
Log:
HADOOP-10052. Temporarily disable client-side symlink resolution (branch-2.2
only change). (wang)
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsDisable.java
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/hdfs-site.xml
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsDisable.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsDisable.java?rev=1533273&r1=1533272&r2=1533273&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsDisable.java
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsDisable.java
Thu Oct 17 22:08:09 2013
@@ -29,7 +29,12 @@ import org.apache.hadoop.hdfs.MiniDFSClu
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Test;
+@SuppressWarnings("deprecation")
public class TestSymlinkHdfsDisable {
+ // Re-enable symlinks for tests, see HADOOP-10020 and HADOOP-10052
+ static {
+ FileSystem.enableSymlinks();
+ }
@Test(timeout=60000)
public void testSymlinkHdfsDisable() throws Exception {
Modified:
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/hdfs-site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/hdfs-site.xml?rev=1533273&r1=1533272&r2=1533273&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/hdfs-site.xml
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/hdfs-site.xml
Thu Oct 17 22:08:09 2013
@@ -31,8 +31,4 @@
<value>0</value>
</property>
- <property>
- <name>test.SymlinkEnabledForTesting</name>
- <value>true</value>
- </property>
</configuration>
