Repository: hbase Updated Branches: refs/heads/0.98 62ce0e21c -> 6bc355721 refs/heads/branch-1 5fe081eb3 -> e85575f56 refs/heads/branch-1.2 8a2cb1608 -> 3b6c3057d refs/heads/master d53318163 -> 2963d59ed
HBASE-15229 Canary Tools should not call System.Exit on error (Vishal Khandelwal) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6bc35572 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6bc35572 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6bc35572 Branch: refs/heads/0.98 Commit: 6bc355721e1f5ec3934cf014f042702345d7e7b7 Parents: 62ce0e2 Author: Andrew Purtell <apurt...@apache.org> Authored: Wed Feb 10 10:19:49 2016 -0800 Committer: Andrew Purtell <apurt...@apache.org> Committed: Wed Feb 10 10:19:55 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/tool/Canary.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6bc35572/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java index 3cc3b7b..d99bc18 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java @@ -590,9 +590,9 @@ public final class Canary implements Tool { if (this.failOnError && monitor.hasError()) { monitorThread.interrupt(); if (monitor.initialized) { - System.exit(monitor.errorCode); + return monitor.errorCode; } else { - System.exit(INIT_ERROR_EXIT_CODE); + return INIT_ERROR_EXIT_CODE; } } currentTimeLength = System.currentTimeMillis() - startTime; @@ -601,17 +601,16 @@ public final class Canary implements Tool { + ") after timeout limit:" + this.timeout + " will be killed itself !!"); if (monitor.initialized) { - System.exit(TIMEOUT_ERROR_EXIT_CODE); + return TIMEOUT_ERROR_EXIT_CODE; } else { - System.exit(INIT_ERROR_EXIT_CODE); + return INIT_ERROR_EXIT_CODE; } - break; } } if (this.failOnError && monitor.finalCheckForErrors()) { monitorThread.interrupt(); - System.exit(monitor.errorCode); + return monitor.errorCode; } } finally { if (monitor != null) monitor.close(); @@ -623,7 +622,7 @@ public final class Canary implements Tool { connection.close(); } - return(monitor.errorCode); + return monitor.errorCode; } private void printUsageAndExit() {