hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject hadoop git commit: HDFS-12485. expunge may fail to remove trash from encryption zone. Contributed by Wei-Chiu Chuang.
Date Tue, 31 Oct 2017 19:53:02 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 166c75a0e -> 1347e83c9


HDFS-12485. expunge may fail to remove trash from encryption zone. Contributed by Wei-Chiu
Chuang.

(cherry picked from commit 8dbc8909c92d502d10a7f94d1de3171878a43b04)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1347e83c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1347e83c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1347e83c

Branch: refs/heads/branch-3.0
Commit: 1347e83c90158d37cb16bed79eafc18947cdf6cc
Parents: 166c75a
Author: Wei-Chiu Chuang <weichiu@apache.org>
Authored: Mon Oct 16 12:57:48 2017 -0700
Committer: Andrew Wang <wang@apache.org>
Committed: Tue Oct 31 12:52:58 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java   | 3 +--
 .../apache/hadoop/hdfs/TestTrashWithSecureEncryptionZones.java    | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1347e83c/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
index 2f9ed19..2a6bd21 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
@@ -2837,8 +2837,7 @@ public class DistributedFileSystem extends FileSystem {
             }
           }
         } else {
-          Path userTrash = new Path(ezTrashRoot, System.getProperty(
-              "user.name"));
+          Path userTrash = new Path(ezTrashRoot, dfs.ugi.getShortUserName());
           try {
             ret.add(getFileStatus(userTrash));
           } catch (FileNotFoundException ignored) {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1347e83c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestTrashWithSecureEncryptionZones.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestTrashWithSecureEncryptionZones.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestTrashWithSecureEncryptionZones.java
index 314adfb..a8e2a71 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestTrashWithSecureEncryptionZones.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestTrashWithSecureEncryptionZones.java
@@ -225,7 +225,6 @@ public class TestTrashWithSecureEncryptionZones {
     clientConf = new Configuration(conf);
     clientConf.setLong(FS_TRASH_INTERVAL_KEY, 1);
     shell = new FsShell(clientConf);
-    System.setProperty("user.name", HDFS_USER_NAME);
   }
 
   @AfterClass


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message