Repository: hbase Updated Branches: refs/heads/0.98 3c46a46dd -> f3369c21b
HBASE-15423 Fix integration issue came due HBASE-15216 from main to 0.98 (Vishal Khandelwal) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f3369c21 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f3369c21 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f3369c21 Branch: refs/heads/0.98 Commit: f3369c21b3dee977ecca0f336487e726866c22df Parents: 3c46a46 Author: Andrew Purtell <[email protected]> Authored: Tue Mar 8 17:54:31 2016 -0800 Committer: Andrew Purtell <[email protected]> Committed: Tue Mar 8 17:54:31 2016 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/tool/Canary.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f3369c21/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 9e0696c..2335ec5 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 @@ -1235,10 +1235,11 @@ public final class Canary implements Tool { public static void main(String[] args) throws Exception { final Configuration conf = HBaseConfiguration.create(); - AuthUtil.launchAuthChore(conf); - + // loading the generic options to conf new GenericOptionsParser(conf, args); + + AuthUtil.launchAuthChore(conf); int numThreads = conf.getInt("hbase.canary.threads.num", MAX_THREADS_NUM); LOG.info("Number of exection threads " + numThreads);
