Repository: hbase Updated Branches: refs/heads/branch-1.2 075f33a06 -> 801d4333c
HBASE-15775 Canary launches two AuthUtil Chores Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/801d4333 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/801d4333 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/801d4333 Branch: refs/heads/branch-1.2 Commit: 801d4333cb705c0fd13b7ab06417aeb2349cf3a7 Parents: 075f33a Author: stack <st...@apache.org> Authored: Fri Jul 8 09:36:17 2016 -0700 Committer: stack <st...@apache.org> Committed: Fri Jul 8 09:37:20 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/tool/Canary.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/801d4333/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 cf89164..c5e75ec 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 @@ -1261,11 +1261,6 @@ public final class Canary implements Tool { public static void main(String[] args) throws Exception { final Configuration conf = HBaseConfiguration.create(); - final ChoreService choreService = new ChoreService("CANARY_TOOL"); - final ScheduledChore authChore = AuthUtil.getAuthChore(conf); - if (authChore != null) { - choreService.scheduleChore(authChore); - } // loading the generic options to conf new GenericOptionsParser(conf, args); @@ -1280,7 +1275,6 @@ public final class Canary implements Tool { Sink sink = ReflectionUtils.newInstance(sinkClass); int exitCode = ToolRunner.run(conf, new Canary(executor, sink), args); - choreService.shutdown(); executor.shutdown(); System.exit(exitCode); }