Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11751. DFSZKFailoverController daemon exits with wrong status code. Contributed by Bharat Viswanadham

This commit is contained in:
Brahma Reddy Battula 2017-12-05 19:53:46 +05:30
parent 99ccca341f
commit 6d16a99ae8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSZKFailoverController.java
View File

@ -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_KEYTAB_FILE_KEY;
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_KERBEROS_PRINCIPAL_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.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -190,14 +191,13 @@ public class DFSZKFailoverController extends ZKFailoverController {
new HdfsConfiguration(), args); new HdfsConfiguration(), args);
DFSZKFailoverController zkfc = DFSZKFailoverController.create( DFSZKFailoverController zkfc = DFSZKFailoverController.create(
parser.getConfiguration()); parser.getConfiguration());
int retCode = 0;
try { try {
retCode = zkfc.run(parser.getRemainingArgs()); System.exit(zkfc.run(parser.getRemainingArgs()));
} catch (Throwable t) { } catch (Throwable t) {
LOG.fatal("DFSZKFailOverController exiting due to earlier exception " LOG.fatal("DFSZKFailOverController exiting due to earlier exception "
+ t); + t);
terminate(1, t);
} }
System.exit(retCode);
} }
@Override @Override