Repository: hadoop Updated Branches: refs/heads/branch-2 05fda24b1 -> ceb4043ae
HDFS-11751. DFSZKFailoverController daemon exits with wrong status code. Contributed by Bharat Viswanadham (cherry picked from commit 6d16a99ae8821c13eec90132e2c63a96fce4b08a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ceb4043a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ceb4043a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ceb4043a Branch: refs/heads/branch-2 Commit: ceb4043ae17151fa61900d4de471f7ac12e6fcfc Parents: 05fda24 Author: Brahma Reddy Battula <bra...@apache.org> Authored: Tue Dec 5 19:53:46 2017 +0530 Committer: Brahma Reddy Battula <bra...@apache.org> Committed: Tue Dec 5 20:01:33 2017 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ceb4043a/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 a710748b..7749164 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 @@ -19,6 +19,7 @@ package org.apache.hadoop.hdfs.tools; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY; +import static org.apache.hadoop.util.ExitUtil.terminate; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -188,14 +189,13 @@ public class DFSZKFailoverController extends ZKFailoverController { new HdfsConfiguration(), args); DFSZKFailoverController zkfc = DFSZKFailoverController.create( parser.getConfiguration()); - int retCode = 0; try { - retCode = zkfc.run(parser.getRemainingArgs()); + System.exit(zkfc.run(parser.getRemainingArgs())); } catch (Throwable t) { LOG.fatal("DFSZKFailOverController exiting due to earlier exception " + t); + terminate(1, t); } - System.exit(retCode); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org