Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andrew Purtell 2016-02-09 22:45:37 -08:00
parent 869c0cf43c
commit 7a718cce71
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
View File

@ -74,6 +74,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.ReflectionUtils; import org.apache.hadoop.hbase.util.ReflectionUtils;
import org.apache.hadoop.hbase.util.RegionSplitter; import org.apache.hadoop.hbase.util.RegionSplitter;
import org.apache.hadoop.util.GenericOptionsParser;
import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner; 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(" -writeSniffing enable the write sniffing in canary");
System.err.println(" -writeTable The table used for write sniffing." System.err.println(" -writeTable The table used for write sniffing."
+ " Default is hbase:canary"); + " Default is hbase:canary");
System.err
.println(" -D<configProperty>=<value> assigning or override the configuration params");
System.exit(USAGE_EXIT_CODE); System.exit(USAGE_EXIT_CODE);
} }
@ -1250,7 +1253,13 @@ public final class Canary implements Tool {
if (authChore != null) { if (authChore != null) {
choreService.scheduleChore(authChore); choreService.scheduleChore(authChore);
} }
// loading the generic options to conf
new GenericOptionsParser(conf, args);
int numThreads = conf.getInt("hbase.canary.threads.num", MAX_THREADS_NUM); int numThreads = conf.getInt("hbase.canary.threads.num", MAX_THREADS_NUM);
LOG.info("Number of exection threads " + numThreads);
ExecutorService executor = new ScheduledThreadPoolExecutor(numThreads); ExecutorService executor = new ScheduledThreadPoolExecutor(numThreads);
Class<? extends Sink> sinkClass = Class<? extends Sink> sinkClass =

1
src/main/asciidoc/_chapters/ops_mgt.adoc
View File

@ -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) -t <N> timeout for a check, default is 600000 (milliseconds)
-writeSniffing enable the write sniffing in canary -writeSniffing enable the write sniffing in canary
-writeTable The table used for write sniffing. Default is hbase: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. This tool will return non zero error codes to user for collaborating with other monitoring tools, such as Nagios.