Skip to content

Commit f37105c

Browse files
Rushabhbusbey
authored 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 Signed-off-by: Sean Busbey <busbey@apache.org> (cherry picked from commit b5a3967)
1 parent 0e5d11e commit f37105c

File tree

5 files changed

+1910
-1762
lines changed

5 files changed

+1910
-1762
lines changed

bin/hbase

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ elif [ "$COMMAND" = "ltt" ] ; then
607607
CLASS='org.apache.hadoop.hbase.util.LoadTestTool'
608608
HBASE_OPTS="$HBASE_OPTS $HBASE_LTT_OPTS"
609609
elif [ "$COMMAND" = "canary" ] ; then
610-
CLASS='org.apache.hadoop.hbase.tool.Canary'
610+
CLASS='org.apache.hadoop.hbase.tool.CanaryTool'
611611
HBASE_OPTS="$HBASE_OPTS $HBASE_CANARY_OPTS"
612612
elif [ "$COMMAND" = "version" ] ; then
613613
CLASS='org.apache.hadoop.hbase.util.VersionInfo'

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
@@ -55,7 +55,7 @@ org.apache.hadoop.hbase.quotas.QuotaUtil;
5555
org.apache.hadoop.hbase.security.access.AccessControlLists;
5656
org.apache.hadoop.hbase.security.visibility.VisibilityConstants;
5757
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;
58-
org.apache.hadoop.hbase.tool.Canary;
58+
org.apache.hadoop.hbase.tool.CanaryTool;
5959
org.apache.hadoop.hbase.util.Bytes;
6060
org.apache.hadoop.hbase.util.FSUtils;
6161
org.apache.hadoop.hbase.util.JvmVersion;
@@ -447,7 +447,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
447447
<%java>String description = null;
448448
if (tableName.equals(TableName.META_TABLE_NAME)){
449449
description = "The hbase:meta table holds references to all User Table regions.";
450-
} else if (tableName.equals(Canary.DEFAULT_WRITE_TABLE_NAME)){
450+
} else if (tableName.equals(CanaryTool.DEFAULT_WRITE_TABLE_NAME)){
451451
description = "The hbase:canary table is used to sniff the write availbility of"
452452
+ " each regionserver.";
453453
} else if (tableName.equals(AccessControlLists.ACL_TABLE_NAME)){

0 commit comments

Comments
 (0)