Repository: hadoop Updated Branches: refs/heads/trunk b5af9be72 -> 9019606b6
HDFS-10731. FSDirectory#verifyMaxDirItems does not log path name. Contributed by Wei-Chiu Chuang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9019606b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9019606b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9019606b Branch: refs/heads/trunk Commit: 9019606b69bfb7019c8642b6cbcbb93645cc19e3 Parents: b5af9be Author: Wei-Chiu Chuang <weic...@apache.org> Authored: Thu Aug 11 14:43:48 2016 -0700 Committer: Wei-Chiu Chuang <weic...@apache.org> Committed: Fri Aug 12 05:58:13 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/protocol/FSLimitException.java | 4 +++- .../java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9019606b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSLimitException.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSLimitException.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSLimitException.java index 2ee11f0..347d892 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSLimitException.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/FSLimitException.java @@ -87,8 +87,10 @@ public abstract class FSLimitException extends QuotaExceededException { super(msg); } - public MaxDirectoryItemsExceededException(long quota, long count) { + public MaxDirectoryItemsExceededException(String path, long quota, + long count) { super(quota, count); + setPathName(path); } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/9019606b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java index b71b8d6..11a7899 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java @@ -991,9 +991,9 @@ public class FSDirectory implements Closeable { final int count = parent.getChildrenList(CURRENT_STATE_ID).size(); if (count >= maxDirItems) { final MaxDirectoryItemsExceededException e - = new MaxDirectoryItemsExceededException(maxDirItems, count); + = new MaxDirectoryItemsExceededException(parentPath, maxDirItems, + count); if (namesystem.isImageLoaded()) { - e.setPathName(parentPath); throw e; } else { // Do not throw if edits log is still being processed --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
