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 wa...@apache.org on 2015/02/25 00:31:23 UTC
hadoop git commit: HDFS-7763. fix zkfc hung issue due to not catching
exception in a corner case. Contributed by Liang Xie.
Repository: hadoop
Updated Branches:
refs/heads/trunk 9a37247a6 -> 7105ebaa9
HDFS-7763. fix zkfc hung issue due to not catching exception in a corner case. Contributed by Liang Xie.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7105ebaa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7105ebaa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7105ebaa
Branch: refs/heads/trunk
Commit: 7105ebaa9f370db04962a1e19a67073dc080433b
Parents: 9a37247
Author: Andrew Wang <wa...@apache.org>
Authored: Tue Feb 24 15:31:13 2015 -0800
Committer: Andrew Wang <wa...@apache.org>
Committed: Tue Feb 24 15:31:13 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../apache/hadoop/hdfs/tools/DFSZKFailoverController.java | 9 +++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7105ebaa/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 618ad70..4ca10da 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1020,6 +1020,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7831. Fix the starting index and end condition of the loop in
FileDiffList.findEarlierSnapshotBlocks(). (Konstantin Shvachko via jing9)
+ HDFS-7763. fix zkfc hung issue due to not catching exception in a corner
+ case. (Liang Xie via wang)
+
BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7105ebaa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java
index a42b1e3..85f77f1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java
@@ -176,8 +176,13 @@ public class DFSZKFailoverController extends ZKFailoverController {
new HdfsConfiguration(), args);
DFSZKFailoverController zkfc = DFSZKFailoverController.create(
parser.getConfiguration());
-
- System.exit(zkfc.run(parser.getRemainingArgs()));
+ int retCode = 0;
+ try {
+ retCode = zkfc.run(parser.getRemainingArgs());
+ } catch (Throwable t) {
+ LOG.fatal("Got a fatal error, exiting now", t);
+ }
+ System.exit(retCode);
}
@Override