Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0C332EE43 for ; Thu, 17 Jan 2013 18:56:12 +0000 (UTC) Received: (qmail 76722 invoked by uid 500); 17 Jan 2013 18:56:09 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 76679 invoked by uid 500); 17 Jan 2013 18:56:09 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 76638 invoked by uid 99); 17 Jan 2013 18:56:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2013 18:56:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2013 18:56:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E9A642388980; Thu, 17 Jan 2013 18:55:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1434864 - in /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs: DFSClient.java protocol/HdfsFileStatus.java Date: Thu, 17 Jan 2013 18:55:48 -0000 To: hdfs-commits@hadoop.apache.org From: tgraves@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130117185548.E9A642388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tgraves Date: Thu Jan 17 18:55:47 2013 New Revision: 1434864 URL: http://svn.apache.org/viewvc?rev=1434864&view=rev Log: HADOOP-9155. FsPermission should have different default value, 777 for directory and 666 for file (Binglin Chang via tgraves) Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java?rev=1434864&r1=1434863&r2=1434864&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java Thu Jan 17 18:55:47 2013 @@ -931,7 +931,7 @@ public class DFSClient implements java.i /** * Call {@link #create(String, FsPermission, EnumSet, short, long, * Progressable, int)} with default permission - * {@link FsPermission#getDefault()}. + * {@link FsPermission#getFileDefault()}. * * @param src File name * @param overwrite overwrite an existing file if true @@ -949,7 +949,7 @@ public class DFSClient implements java.i Progressable progress, int buffersize) throws IOException { - return create(src, FsPermission.getDefault(), + return create(src, FsPermission.getFileDefault(), overwrite ? EnumSet.of(CreateFlag.CREATE, CreateFlag.OVERWRITE) : EnumSet.of(CreateFlag.CREATE), replication, blockSize, progress, buffersize, null); @@ -980,7 +980,7 @@ public class DFSClient implements java.i * * @param src File name * @param permission The permission of the directory being created. - * If null, use default permission {@link FsPermission#getDefault()} + * If null, use default permission {@link FsPermission#getFileDefault()} * @param flag indicates create a new file or create/overwrite an * existing file or append to an existing file * @param createParent create missing parent directory if true @@ -1006,7 +1006,7 @@ public class DFSClient implements java.i ChecksumOpt checksumOpt) throws IOException { checkOpen(); if (permission == null) { - permission = FsPermission.getDefault(); + permission = FsPermission.getFileDefault(); } FsPermission masked = permission.applyUMask(dfsClientConf.uMask); if(LOG.isDebugEnabled()) { Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java?rev=1434864&r1=1434863&r2=1434864&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java Thu Jan 17 18:55:47 2013 @@ -92,7 +92,10 @@ public class HdfsFileStatus implements W this.modification_time = modification_time; this.access_time = access_time; this.permission = (permission == null) ? - FsPermission.getDefault() : permission; + ((isdir || symlink!=null) ? + FsPermission.getDefault() : + FsPermission.getFileDefault()) : + permission; this.owner = (owner == null) ? "" : owner; this.group = (group == null) ? "" : group; this.symlink = symlink;