You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2013/10/07 01:17:39 UTC
svn commit: r1529712 - in
/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/fs/FileContext.java
src/main/java/org/apache/hadoop/fs/FileSystem.java
src/test/resources/core-site.xml
Author: suresh
Date: Sun Oct 6 23:17:39 2013
New Revision: 1529712
URL: http://svn.apache.org/r1529712
Log:
HADOOP-10020. Disable symlinks temporarily (branch-2.1-beta only change). Contributed by Sanjay Radia.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1529712&r1=1529711&r2=1529712&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Sun Oct 6 23:17:39 2013
@@ -19,6 +19,9 @@ Release 2.1.2 - UNRELEASED
INCOMPATIBLE CHANGES
+ HADOOP-10020. Disable symlinks temporarily (branch-2.1-beta only change)
+ (sanjay via suresh)
+
NEW FEATURES
HDFS-4817. Make HDFS advisory caching configurable on a per-file basis.
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java?rev=1529712&r1=1529711&r2=1529712&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java Sun Oct 6 23:17:39 2013
@@ -1339,11 +1339,15 @@ public final class FileContext {
* <code>target</code> or <code>link</code> is not supported
* @throws IOException If an I/O error occurred
*/
+ @SuppressWarnings("deprecation")
public void createSymlink(final Path target, final Path link,
final boolean createParent) throws AccessControlException,
FileAlreadyExistsException, FileNotFoundException,
ParentNotDirectoryException, UnsupportedFileSystemException,
IOException {
+ if (!FileSystem.isSymlinksEnabled()) {
+ throw new UnsupportedOperationException("Symlinks not supported");
+ }
final Path nonRelLink = fixRelativePart(link);
new FSLinkResolver<Void>() {
@Override
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java?rev=1529712&r1=1529711&r2=1529712&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java Sun Oct 6 23:17:39 2013
@@ -2807,4 +2807,24 @@ public abstract class FileSystem extends
": " + pair.getValue());
}
}
+
+ // Symlinks are temporarily disabled - see Hadoop-10020
+ private static boolean symlinkEnabled = false;
+ private static Configuration conf = null;
+
+ @Deprecated
+ @VisibleForTesting
+ public static boolean isSymlinksEnabled() {
+ if (conf == null) {
+ Configuration conf = new Configuration();
+ symlinkEnabled = conf.getBoolean("test.SymlinkEnabledForTesting", false);
+ }
+ return symlinkEnabled;
+ }
+
+ @Deprecated
+ @VisibleForTesting
+ public static void enableSymlinks() {
+ symlinkEnabled = true;
+ }
}
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml?rev=1529712&r1=1529711&r2=1529712&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/test/resources/core-site.xml Sun Oct 6 23:17:39 2013
@@ -78,4 +78,9 @@
<name>nfs3.mountd.port</name>
<value>4272</value>
</property>
+
+<property>
+ <name>test.SymlinkEnabledForTesting</name>
+ <value>true</value>
+</property>
</configuration>