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

HDFS-4801. lsSnapshottableDir throws IllegalArgumentException when root is snapshottable. Contributed by Jing Zhao

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1479709 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2013-05-06 22:48:54 +00:00
parent 0aab1ef996
commit 98b416f5ac
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-2802.txt
View File

@ -341,3 +341,6 @@ Branch-2802 Snapshot (Unreleased)
HDFS-4800. Fix INodeDirectoryWithSnapshot#cleanDeletedINode. (Jing Zhao via HDFS-4800. Fix INodeDirectoryWithSnapshot#cleanDeletedINode. (Jing Zhao via
szetszwo) szetszwo)
HDFS-4801. lsSnapshottableDir throws IllegalArgumentException when root is
snapshottable. (Jing Zhao via szetszwo)

15
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/SnapshottableDirectoryStatus.java
View File

@ -98,10 +98,17 @@ public HdfsFileStatus getDirStatus() {
* @return Full path of the file * @return Full path of the file
*/ */
public Path getFullPath() { public Path getFullPath() {
String parentFullPathStr = (parentFullPath == null || parentFullPath.length == 0) ? null String parentFullPathStr =
: DFSUtil.bytes2String(parentFullPath); (parentFullPath == null || parentFullPath.length == 0) ?
return parentFullPathStr == null ? new Path(dirStatus.getLocalName()) null : DFSUtil.bytes2String(parentFullPath);
: new Path(parentFullPathStr, dirStatus.getLocalName()); if (parentFullPathStr == null
&& dirStatus.getLocalNameInBytes().length == 0) {
// root
return new Path("/");
} else {
return parentFullPathStr == null ? new Path(dirStatus.getLocalName())
: new Path(parentFullPathStr, dirStatus.getLocalName());
}
} }
/** /**

13
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshottableDirListing.java
View File

@ -81,6 +81,19 @@ public void testListSnapshottableDir() throws Exception {
SnapshottableDirectoryStatus[] dirs = hdfs.getSnapshottableDirListing(); SnapshottableDirectoryStatus[] dirs = hdfs.getSnapshottableDirListing();
assertNull(dirs); assertNull(dirs);
// Make root as snapshottable
final Path root = new Path("/");
hdfs.allowSnapshot(root);
dirs = hdfs.getSnapshottableDirListing();
assertEquals(1, dirs.length);
assertEquals("", dirs[0].getDirStatus().getLocalName());
assertEquals(root, dirs[0].getFullPath());
// Make root non-snaphsottable
hdfs.disallowSnapshot(root);
dirs = hdfs.getSnapshottableDirListing();
assertNull(dirs);
// Make dir1 as snapshottable // Make dir1 as snapshottable
hdfs.allowSnapshot(dir1); hdfs.allowSnapshot(dir1);
dirs = hdfs.getSnapshottableDirListing(); dirs = hdfs.getSnapshottableDirListing();