Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit 8dbc8909c9)
This commit is contained in:
Wei-Chiu Chuang 2017-10-16 12:57:48 -07:00 committed by Andrew Wang
parent 166c75a0eb
commit 1347e83c90
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
View File

@ -2837,8 +2837,7 @@ public class DistributedFileSystem extends FileSystem {
} }
} }
} else { } else {
Path userTrash = new Path(ezTrashRoot, System.getProperty( Path userTrash = new Path(ezTrashRoot, dfs.ugi.getShortUserName());
"user.name"));
try { try {
ret.add(getFileStatus(userTrash)); ret.add(getFileStatus(userTrash));
} catch (FileNotFoundException ignored) { } catch (FileNotFoundException ignored) {

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestTrashWithSecureEncryptionZones.java
View File

@ -225,7 +225,6 @@ public class TestTrashWithSecureEncryptionZones {
clientConf = new Configuration(conf); clientConf = new Configuration(conf);
clientConf.setLong(FS_TRASH_INTERVAL_KEY, 1); clientConf.setLong(FS_TRASH_INTERVAL_KEY, 1);
shell = new FsShell(clientConf); shell = new FsShell(clientConf);
System.setProperty("user.name", HDFS_USER_NAME);
} }
@AfterClass @AfterClass