Skip to content

Commit b5a3967

Browse files
Rushabhbusbey
authored andcommitted
HBASE-22874 Define a public API for Canary checking and a non-public tool implementation
Closes apache#580 * Canary is now an IA.Public interface * CanaryTool is now the implementation Signed-off-by: Sean Busbey <busbey@apache.org>
1 parent 61bc57f commit b5a3967

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
@@ -615,7 +615,7 @@ elif [ "$COMMAND" = "ltt" ] ; then
615615
CLASS='org.apache.hadoop.hbase.util.LoadTestTool'
616616
HBASE_OPTS="$HBASE_OPTS $HBASE_LTT_OPTS"
617617
elif [ "$COMMAND" = "canary" ] ; then
618-
CLASS='org.apache.hadoop.hbase.tool.Canary'
618+
CLASS='org.apache.hadoop.hbase.tool.CanaryTool'
619619
HBASE_OPTS="$HBASE_OPTS $HBASE_CANARY_OPTS"
620620
elif [ "$COMMAND" = "version" ] ; then
621621
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.PermissionStorage;
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;
@@ -513,7 +513,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
513513
<%java>String description = null;
514514
if (tableName.equals(TableName.META_TABLE_NAME)){
515515
description = "The hbase:meta table holds references to all User Table regions.";
516-
} else if (tableName.equals(Canary.DEFAULT_WRITE_TABLE_NAME)){
516+
} else if (tableName.equals(CanaryTool.DEFAULT_WRITE_TABLE_NAME)){
517517
description = "The hbase:canary table is used to sniff the write availbility of"
518518
+ " each regionserver.";
519519
} else if (tableName.equals(PermissionStorage.ACL_TABLE_NAME)){

0 commit comments

Comments
 (0)