From fec9e71e3bb6216f426c77147908b28ca2a4e975 Mon Sep 17 00:00:00 2001 From: Elliott Neil Clark Date: Tue, 31 Dec 2013 11:09:17 -0800 Subject: [PATCH] HBASE-10260 Canary Doesn't pick up Configuration properly. --- hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 3f3dfd3..2a3b229 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 @@ -35,6 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.DoNotRetryIOException; +import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; @@ -741,7 +742,7 @@ public final class Canary implements Tool { } public static void main(String[] args) throws Exception { - int exitCode = ToolRunner.run(new Canary(), args); + int exitCode = ToolRunner.run(HBaseConfiguration.create(), new Canary(), args); System.exit(exitCode); } } -- 1.8.4.3