hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-14021 Quota table has a wrong description on the UI (Ashish Singhi)
Date Thu, 06 Aug 2015 14:30:26 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 ade125a4c -> 93dbf8baa


HBASE-14021 Quota table has a wrong description on the UI (Ashish Singhi)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/93dbf8ba
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/93dbf8ba
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/93dbf8ba

Branch: refs/heads/branch-1.1
Commit: 93dbf8baae46e4cb2470956e36e383f8ed0e308a
Parents: ade125a
Author: tedyu <yuzhihong@gmail.com>
Authored: Thu Aug 6 07:30:16 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Thu Aug 6 07:30:16 2015 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/93dbf8ba/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index 46cdfa9..2be0722 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -53,6 +53,7 @@ org.apache.hadoop.hbase.master.DeadServer;
 org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 org.apache.hadoop.hbase.security.visibility.VisibilityConstants;
 org.apache.hadoop.hbase.security.access.AccessControlLists;
+org.apache.hadoop.hbase.quotas.QuotaUtil;
 </%import>
 
 <%if format.equals("json") %>
@@ -369,8 +370,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
             description = "The hbase:acl table holds information about acl";
 	 } else if (tableName.equals(VisibilityConstants.LABELS_TABLE_NAME)){
 	     description = "The hbase:labels table holds information about visibility labels";
-        } else {
-            description = "The .NAMESPACE. table holds information about namespaces.";
+        } else if (tableName.equals(TableName.NAMESPACE_TABLE_NAME)){
+            description = "The hbase:namespace table holds information about namespaces.";
+        } else if (tableName.equals(QuotaUtil.QUOTA_TABLE_NAME)){
+            description = "The hbase:quota table holds quota information about number" +
+            " or size of requests in a given time frame.";
         }
     </%java>
     <td><% description %></td>
@@ -382,7 +386,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
 
 <%def userTables>
 <%java>
-   HTableDescriptor[] tables = null; 
+   HTableDescriptor[] tables = null;
    try (Admin admin = master.getConnection().getAdmin()) {
      tables = master.isInitialized() ? admin.listTables() : null;
    }


Mime
View raw message