You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2017/10/20 04:46:17 UTC
[39/50] [abbrv] hadoop git commit: HDFS-12619. Do not catch and throw
unchecked exceptions if IBRs fail to process. Contributed by Wei-Chiu Chuang.
HDFS-12619. Do not catch and throw unchecked exceptions if IBRs fail to process. 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/4ab0c8f9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ab0c8f9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ab0c8f9
Branch: refs/heads/YARN-1011
Commit: 4ab0c8f96a41c573cc1f1e71c18871d243f952b9
Parents: 97c70c7
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Thu Oct 19 06:17:59 2017 -0700
Committer: Wei-Chiu Chuang <we...@apache.org>
Committed: Thu Oct 19 06:17:59 2017 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/server/blockmanagement/BlockManager.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ab0c8f9/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 386ba27..8b0f094 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -3889,11 +3889,15 @@ public class BlockManager implements BlockStatsMXBean {
throw new IOException(
"Got incremental block report from unregistered or dead node");
}
+
+ boolean successful = false;
try {
processIncrementalBlockReport(node, srdb);
- } catch (Exception ex) {
- node.setForceRegistration(true);
- throw ex;
+ successful = true;
+ } finally {
+ if (!successful) {
+ node.setForceRegistration(true);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org