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

HDFS-10731. FSDirectory#verifyMaxDirItems does not log path name. Contributed by Wei-Chiu Chuang.

Browse Source 
(cherry picked from commit 9019606b69bfb7019c8642b6cbcbb93645cc19e3)
(cherry picked from commit 20a8ff0a8d17c05305f712da887ad6665eb654b5)
This commit is contained in:
Wei-Chiu Chuang 2016-08-11 14:43:48 -07:00
parent 9c1c48c0d4
commit 53f097a474
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSLimitException.java
View File

@ -87,8 +87,10 @@ protected MaxDirectoryItemsExceededException(String msg) {
super(msg); super(msg);
} }
public MaxDirectoryItemsExceededException(long quota, long count) { public MaxDirectoryItemsExceededException(String path, long quota,
long count) {
super(quota, count); super(quota, count);
setPathName(path);
} }
@Override @Override

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
View File

@ -1004,9 +1004,9 @@ void verifyMaxDirItems(INodeDirectory parent, String parentPath)
final int count = parent.getChildrenList(CURRENT_STATE_ID).size(); final int count = parent.getChildrenList(CURRENT_STATE_ID).size();
if (count >= maxDirItems) { if (count >= maxDirItems) {
final MaxDirectoryItemsExceededException e final MaxDirectoryItemsExceededException e
= new MaxDirectoryItemsExceededException(maxDirItems, count); = new MaxDirectoryItemsExceededException(parentPath, maxDirItems,
count);
if (namesystem.isImageLoaded()) { if (namesystem.isImageLoaded()) {
e.setPathName(parentPath);
throw e; throw e;
} else { } else {
// Do not throw if edits log is still being processed // Do not throw if edits log is still being processed