hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weic...@apache.org
Subject hadoop git commit: HDFS-10731. FSDirectory#verifyMaxDirItems does not log path name. Contributed by Wei-Chiu Chuang.
Date Fri, 12 Aug 2016 13:11:37 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 9c1c48c0d -> 53f097a47


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

(cherry picked from commit 9019606b69bfb7019c8642b6cbcbb93645cc19e3)
(cherry picked from commit 20a8ff0a8d17c05305f712da887ad6665eb654b5)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/53f097a4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/53f097a4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/53f097a4

Branch: refs/heads/branch-2.8
Commit: 53f097a47438abd2e0b6cfcbc46e4366313ca635
Parents: 9c1c48c
Author: Wei-Chiu Chuang <weichiu@apache.org>
Authored: Thu Aug 11 14:43:48 2016 -0700
Committer: Wei-Chiu Chuang <weichiu@apache.org>
Committed: Fri Aug 12 06:11:22 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/53f097a4/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/53f097a4/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 9ce244c..2148368 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
@@ -1004,9 +1004,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message