HDFS-9844. Correct path creation in getTrashRoot to handle root dir.
Change-Id: I5afe6c7176063892e3e632698c849bd9f4b92906
This commit is contained in:
parent
d284e187b8
commit
647a35e996
|
@ -2355,7 +2355,7 @@ public class DistributedFileSystem extends FileSystem {
|
|||
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) {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1428,6 +1428,20 @@ public class TestEncryptionZones {
|
|||
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 {
|
||||
|
|
Loading…
Reference in New Issue