You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/02/10 07:56:49 UTC
[2/4] hbase git commit: HBASE-15216 Canary does not accept config
params from command line (Vishal Khandelwal)
HBASE-15216 Canary does not accept config params from command line (Vishal Khandelwal)
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7a718cce
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7a718cce
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7a718cce
Branch: refs/heads/branch-1
Commit: 7a718cce71260016cd48801e69dae64857cad04f
Parents: 869c0cf
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Feb 9 22:45:37 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 9 22:46:20 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/tool/Canary.java | 9 +++++++++
src/main/asciidoc/_chapters/ops_mgt.adoc | 1 +
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7a718cce/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 e103ebd..055e97e 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
@@ -74,6 +74,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.ReflectionUtils;
import org.apache.hadoop.hbase.util.RegionSplitter;
+import org.apache.hadoop.util.GenericOptionsParser;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
@@ -637,6 +638,8 @@ public final class Canary implements Tool {
System.err.println(" -writeSniffing enable the write sniffing in canary");
System.err.println(" -writeTable The table used for write sniffing."
+ " Default is hbase:canary");
+ System.err
+ .println(" -D<configProperty>=<value> assigning or override the configuration params");
System.exit(USAGE_EXIT_CODE);
}
@@ -1250,7 +1253,13 @@ public final class Canary implements Tool {
if (authChore != null) {
choreService.scheduleChore(authChore);
}
+
+ // loading the generic options to conf
+ new GenericOptionsParser(conf, args);
+
int numThreads = conf.getInt("hbase.canary.threads.num", MAX_THREADS_NUM);
+ LOG.info("Number of exection threads " + numThreads);
+
ExecutorService executor = new ScheduledThreadPoolExecutor(numThreads);
Class<? extends Sink> sinkClass =
http://git-wip-us.apache.org/repos/asf/hbase/blob/7a718cce/src/main/asciidoc/_chapters/ops_mgt.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/ops_mgt.adoc b/src/main/asciidoc/_chapters/ops_mgt.adoc
index 06990e6..3984a0d 100644
--- a/src/main/asciidoc/_chapters/ops_mgt.adoc
+++ b/src/main/asciidoc/_chapters/ops_mgt.adoc
@@ -94,6 +94,7 @@ Usage: bin/hbase org.apache.hadoop.hbase.tool.Canary [opts] [table1 [table2]...]
-t <N> timeout for a check, default is 600000 (milliseconds)
-writeSniffing enable the write sniffing in canary
-writeTable The table used for write sniffing. Default is hbase:canary
+ -D<configProperty>=<value> assigning or override the configuration params
----
This tool will return non zero error codes to user for collaborating with other monitoring tools, such as Nagios.