big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-9844. Correct path creation in getTrashRoot to handle root dir.

Browse Source 
Change-Id: I5afe6c7176063892e3e632698c849bd9f4b92906
This commit is contained in:
Zhe Zhang 2016-02-23 13:29:39 -08:00
parent d284e187b8
commit 647a35e996
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2355,7 +2355,7 @@ public Path getTrashRoot(Path path) {
EncryptionZone ez = dfs.getEZForPath(parentSrc);
if ((ez != null)) {
return this.makeQualified(
new Path(ez.getPath() + "/" + FileSystem.TRASH_PREFIX +
new Path(ez.getPath(), FileSystem.TRASH_PREFIX +
dfs.ugi.getShortUserName()));
}
} catch (IOException e) {

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1954,6 +1954,8 @@ Release 2.8.0 - UNRELEASED
HDFS-9084. Pagination, sorting and filtering of files/directories in the
HDFS Web UI. (Ravi Prakash via ozawa)
HDFS-9844. Correct path creation in getTrashRoot to handle root dir. (zhz)
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

14
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java
View File

@ -1428,6 +1428,20 @@ public void testEncryptionZoneWithTrash() throws Exception {
verifyShellDeleteWithTrash(shell, topEZ);
}
@Test(timeout = 120000)
public void testRootDirEZTrash() throws Exception {
final HdfsAdmin dfsAdmin =
new HdfsAdmin(FileSystem.getDefaultUri(conf), conf);
dfsAdmin.createEncryptionZone(new Path("/"), TEST_KEY);
final Path encFile = new Path("/encFile");
final int len = 8192;
DFSTestUtil.createFile(fs, encFile, len, (short) 1, 0xFEED);
Configuration clientConf = new Configuration(conf);
clientConf.setLong(FS_TRASH_INTERVAL_KEY, 1);
FsShell shell = new FsShell(clientConf);
verifyShellDeleteWithTrash(shell, encFile);
}
private void verifyShellDeleteWithTrash(FsShell shell, Path path)
throws Exception{
try {