You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/02/13 21:10:15 UTC
[04/22] 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)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bab812df
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bab812df
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bab812df
Branch: refs/heads/hbase-12439
Commit: bab812df289a3bb33407446a8910e3bb5c6195e0
Parents: b6328eb
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:45:37 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/bab812df/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 151be42..837688e 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
@@ -76,6 +76,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.Pair;
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;
@@ -640,6 +641,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);
}
@@ -1184,7 +1187,13 @@ public final class Canary implements Tool {
public static void main(String[] args) throws Exception {
final Configuration conf = HBaseConfiguration.create();
+
+ // 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/bab812df/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 13835c0..0f93785 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.