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 to...@apache.org on 2011/04/13 00:35:10 UTC
svn commit: r1091589 - in /hadoop/common/branches/branch-0.22: CHANGES.txt
src/java/org/apache/hadoop/fs/FileSystem.java
src/test/core/org/apache/hadoop/fs/TestLocalFileSystemPermission.java
Author: tomwhite
Date: Tue Apr 12 22:35:10 2011
New Revision: 1091589
URL: http://svn.apache.org/viewvc?rev=1091589&view=rev
Log:
Merge -r 1091587:1091588 from trunk to branch-0.22. Fixes: HADOOP-6898
Modified:
hadoop/common/branches/branch-0.22/CHANGES.txt
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FileSystem.java
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/TestLocalFileSystemPermission.java
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1091589&r1=1091588&r2=1091589&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Tue Apr 12 22:35:10 2011
@@ -435,6 +435,9 @@ Release 0.22.0 - Unreleased
HADOOP-7156. Workaround for unsafe implementations of getpwuid_r (todd)
+ HADOOP-6898. FileSystem.copyToLocal creates files with 777 permissions.
+ (Aaron T. Myers via tomwhite)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FileSystem.java?rev=1091589&r1=1091588&r2=1091589&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/fs/FileSystem.java Tue Apr 12 22:35:10 2011
@@ -659,7 +659,8 @@ public abstract class FileSystem extends
long blockSize,
Progressable progress
) throws IOException {
- return this.create(f, FsPermission.getDefault(), overwrite, bufferSize,
+ return this.create(f, FsPermission.getDefault().applyUMask(
+ FsPermission.getUMask(getConf())), overwrite, bufferSize,
replication, blockSize, progress);
}
Modified: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/TestLocalFileSystemPermission.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/TestLocalFileSystemPermission.java?rev=1091589&r1=1091588&r2=1091589&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/TestLocalFileSystemPermission.java (original)
+++ hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/fs/TestLocalFileSystemPermission.java Tue Apr 12 22:35:10 2011
@@ -71,7 +71,9 @@ public class TestLocalFileSystemPermissi
String filename = "foo";
Path f = writeFile(localfs, filename);
try {
- System.out.println(filename + ": " + getPermission(localfs, f));
+ FsPermission initialPermission = getPermission(localfs, f);
+ System.out.println(filename + ": " + initialPermission);
+ assertEquals(FsPermission.getDefault().applyUMask(FsPermission.getUMask(conf)), initialPermission);
}
catch(Exception e) {
System.out.println(StringUtils.stringifyException(e));