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 ww...@apache.org on 2019/01/22 04:23:30 UTC
[hadoop] branch branch-3.1 updated: HDFS-14207. ZKFC should catch
exception when ha configuration missing. Contributed by Fei Hui.
This is an automated email from the ASF dual-hosted git repository.
wwei pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new cf520b7 HDFS-14207. ZKFC should catch exception when ha configuration missing. Contributed by Fei Hui.
cf520b7 is described below
commit cf520b7d64d910e465bf459326bdfdd02c192cd2
Author: Weiwei Yang <ww...@apache.org>
AuthorDate: Tue Jan 22 12:01:08 2019 +0800
HDFS-14207. ZKFC should catch exception when ha configuration missing. Contributed by Fei Hui.
(cherry picked from commit de34fc148ca4785c2ae7204df15096b955e671c4)
---
.../java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 e0a4f70..f1f45a1 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
@@ -189,9 +189,9 @@ public class DFSZKFailoverController extends ZKFailoverController {
GenericOptionsParser parser = new GenericOptionsParser(
new HdfsConfiguration(), args);
- DFSZKFailoverController zkfc = DFSZKFailoverController.create(
- parser.getConfiguration());
try {
+ DFSZKFailoverController zkfc = DFSZKFailoverController.create(
+ parser.getConfiguration());
System.exit(zkfc.run(parser.getRemainingArgs()));
} catch (Throwable t) {
LOG.fatal("DFSZKFailOverController exiting due to earlier exception "
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org