Skip to content

Commit 638508e

Browse files
Rushabhbusbey
andcommitted
HBASE-22874 Define a public API for Canary checking and a non-public tool implementation
Closes #580 * Canary is now an IA.Public interface * CanaryTool is now the implementation Branch-1 specific changes for differences in APIs and cleanup of the ref guide using a classname. Co-authored-by: Sean Busbey <busbey@apache.org> Signed-off-by: Sean Busbey <busbey@apache.org>
1 parent 0ffbf9c commit 638508e

File tree

6 files changed

+1927
-1737
lines changed

6 files changed

+1927
-1737
lines changed

bin/hbase

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ elif [ "$COMMAND" = "ltt" ] ; then
401401
CLASS='org.apache.hadoop.hbase.util.LoadTestTool'
402402
HBASE_OPTS="$HBASE_OPTS $HBASE_LTT_OPTS"
403403
elif [ "$COMMAND" = "canary" ] ; then
404-
CLASS='org.apache.hadoop.hbase.tool.Canary'
404+
CLASS='org.apache.hadoop.hbase.tool.CanaryTool'
405405
HBASE_OPTS="$HBASE_OPTS $HBASE_CANARY_OPTS"
406406
elif [ "$COMMAND" = "hbtop" ] ; then
407407
CLASS='org.apache.hadoop.hbase.hbtop.HBTop'

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ org.apache.hadoop.hbase.master.RegionState;
4949
org.apache.hadoop.hbase.HTableDescriptor;
5050
org.apache.hadoop.hbase.HBaseConfiguration;
5151
org.apache.hadoop.hbase.TableName;
52-
org.apache.hadoop.hbase.tool.Canary;
52+
org.apache.hadoop.hbase.tool.CanaryTool;
5353
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
5454
org.apache.hadoop.hbase.master.DeadServer;
5555
org.apache.hadoop.hbase.protobuf.ProtobufUtil;
@@ -412,7 +412,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
412412
<%java>String description = null;
413413
if (tableName.equals(TableName.META_TABLE_NAME)){
414414
description = "The hbase:meta table holds references to all User Table regions.";
415-
} else if (tableName.equals(Canary.DEFAULT_WRITE_TABLE_NAME)){
415+
} else if (tableName.equals(CanaryTool.DEFAULT_WRITE_TABLE_NAME)){
416416
description = "The hbase:canary table is used to sniff the write availbility of"
417417
+ " each regionserver.";
418418
} else if (tableName.equals(AccessControlLists.ACL_TABLE_NAME)){

0 commit comments

Comments
 (0)