diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java index 5646d12..bff46d7 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java @@ -201,7 +201,7 @@ public class IntegrationTestMTTR { restartMasterAction.init(actionContext); } - private static void setupTables() throws IOException { + private static void setupTables() throws Exception { // Get the table name. tableName = TableName.valueOf(util.getConfiguration() .get("hbase.IntegrationTestMTTR.tableName", "IntegrationTestMTTR")); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java index 28b4250..9b0b6b9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java @@ -82,7 +82,7 @@ public abstract class AbstractHBaseTool implements Tool { } @Override - public final int run(String[] args) throws IOException { + public final int run(String[] args) throws Exception { if (conf == null) { LOG.error("Tool configuration is not initialized"); throw new NullPointerException("conf"); @@ -107,14 +107,7 @@ public abstract class AbstractHBaseTool implements Tool { processOptions(cmd); - int ret = EXIT_FAILURE; - try { - ret = doWork(); - } catch (Exception e) { - LOG.error("Error running command-line tool", e); - return EXIT_FAILURE; - } - return ret; + return doWork(); } private boolean sanityCheckOptions(CommandLine cmd) { @@ -184,15 +177,7 @@ public abstract class AbstractHBaseTool implements Tool { } /** Call this from the concrete tool class's main function. */ - protected void doStaticMain(String args[]) { - int ret; - try { - ret = ToolRunner.run(HBaseConfiguration.create(), this, args); - } catch (Exception ex) { - LOG.error("Error running command-line tool", ex); - ret = EXIT_FAILURE; - } - System.exit(ret); + protected void doStaticMain(String args[]) throws Exception { + ToolRunner.run(HBaseConfiguration.create(), this, args); } - } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java index ff2e93b..ebd1f2d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java @@ -537,7 +537,7 @@ public class LoadTestTool extends AbstractHBaseTool { } return b; } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { new LoadTestTool().doStaticMain(args); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java index 45c5957..998a76f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/RestartMetaTest.java @@ -146,7 +146,7 @@ public class RestartMetaTest extends AbstractHBaseTool { String.valueOf(DEFAULT_NUM_RS))); } - public static void main(String[] args) { + public static void main(String[] args) throws Exception { new RestartMetaTest().doStaticMain(args); }