[08/15] hbase git commit: HBASE-19186 Unify to use bytes to show size in master/rs ui
HBASE-19186 Unify to use bytes to show size in master/rs ui Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b6011a16 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b6011a16 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b6011a16 Branch: refs/heads/HBASE-19189 Commit: b6011a16fffebae21e56c41206b29d96c0613024 Parents: 2a99b87 Author: Guanghao Zhang Authored: Sun Nov 5 12:41:02 2017 +0800 Committer: Guanghao Zhang Committed: Tue Nov 7 10:07:03 2017 +0800 -- .../tmpl/regionserver/BlockCacheTmpl.jamon | 4 +- .../tmpl/regionserver/ServerMetricsTmpl.jamon | 10 +- .../hbase-webapps/master/procedures.jsp | 9 +- .../hbase-webapps/master/processMaster.jsp | 9 +- .../hbase-webapps/master/processRS.jsp | 228 --- .../resources/hbase-webapps/master/table.jsp| 2 +- .../hbase-webapps/regionserver/processRS.jsp| 9 +- 7 files changed, 23 insertions(+), 248 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/b6011a16/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon -- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon index b4e44d8..5ea5bcc 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon @@ -244,13 +244,13 @@ org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix; Size <% TraditionalBinaryPrefix.long2String(cacheConfig.getBlockCache().getCurrentSize(), "B", 1) %> -Current size of block cache in use (bytes) +Current size of block cache in use Free <% TraditionalBinaryPrefix.long2String(cacheConfig.getBlockCache().getFreeSize(), "B", 1) %> -The total free memory currently available to store more cache entries (bytes) +The total free memory currently available to store more cache entries Count http://git-wip-us.apache.org/repos/asf/hbase/blob/b6011a16/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon -- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon index 2e99d5b..adcfff1 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon @@ -146,7 +146,7 @@ MetricsRegionServerWrapper mWrap; Num. WAL Files -Size. WAL Files (bytes) +Size. WAL Files @@ -165,9 +165,9 @@ MetricsRegionServerWrapper mWrap; Num. Stores Num. Storefiles -Root Index Size (bytes) -Index Size (bytes) -Bloom Size (bytes) +Root Index Size +Index Size +Bloom Size <% mWrap.getNumStores() %> @@ -212,7 +212,7 @@ MetricsHBaseServerWrapper mServerWrap; Priority Call Queue Length General Call Queue Length Replication Call Queue Length -Total Call Queue Size (bytes) +Total Call Queue Size http://git-wip-us.apache.org/repos/asf/hbase/blob/b6011a16/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp -- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp index 63a41cc..c3df296 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp @@ -39,6 +39,7 @@ import="org.apache.hadoop.hbase.procedure2.util.StringUtils" import="org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos" import="org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil" + import="org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix" %> <% HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); @@ -173,7 +174,7 @@ <%ProcedureWALFile pwf = procedureWALFiles.get(i); %> <%= pwf.getLogId() %> - <%= StringUtils.humanSize(pwf.getSize()) %> + <%= TraditionalBinaryPrefix.long2String(pwf.getSize(), "B", 1) %> <%= new Date(
hbase git commit: HBASE-19186 Unify to use bytes to show size in master/rs ui
Repository: hbase Updated Branches: refs/heads/branch-2 f4a4144f3 -> 40dac699b HBASE-19186 Unify to use bytes to show size in master/rs ui Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/40dac699 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/40dac699 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/40dac699 Branch: refs/heads/branch-2 Commit: 40dac699bd7ca37fd2401d60f10bebb8a856ad88 Parents: f4a4144 Author: Guanghao Zhang Authored: Sun Nov 5 12:41:02 2017 +0800 Committer: Guanghao Zhang Committed: Tue Nov 7 10:07:52 2017 +0800 -- .../tmpl/regionserver/BlockCacheTmpl.jamon | 4 +- .../tmpl/regionserver/ServerMetricsTmpl.jamon | 10 +- .../hbase-webapps/master/procedures.jsp | 9 +- .../hbase-webapps/master/processMaster.jsp | 9 +- .../hbase-webapps/master/processRS.jsp | 228 --- .../resources/hbase-webapps/master/table.jsp| 2 +- .../hbase-webapps/regionserver/processRS.jsp| 9 +- 7 files changed, 23 insertions(+), 248 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/40dac699/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon -- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon index b4e44d8..5ea5bcc 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon @@ -244,13 +244,13 @@ org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix; Size <% TraditionalBinaryPrefix.long2String(cacheConfig.getBlockCache().getCurrentSize(), "B", 1) %> -Current size of block cache in use (bytes) +Current size of block cache in use Free <% TraditionalBinaryPrefix.long2String(cacheConfig.getBlockCache().getFreeSize(), "B", 1) %> -The total free memory currently available to store more cache entries (bytes) +The total free memory currently available to store more cache entries Count http://git-wip-us.apache.org/repos/asf/hbase/blob/40dac699/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon -- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon index 2e99d5b..adcfff1 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon @@ -146,7 +146,7 @@ MetricsRegionServerWrapper mWrap; Num. WAL Files -Size. WAL Files (bytes) +Size. WAL Files @@ -165,9 +165,9 @@ MetricsRegionServerWrapper mWrap; Num. Stores Num. Storefiles -Root Index Size (bytes) -Index Size (bytes) -Bloom Size (bytes) +Root Index Size +Index Size +Bloom Size <% mWrap.getNumStores() %> @@ -212,7 +212,7 @@ MetricsHBaseServerWrapper mServerWrap; Priority Call Queue Length General Call Queue Length Replication Call Queue Length -Total Call Queue Size (bytes) +Total Call Queue Size http://git-wip-us.apache.org/repos/asf/hbase/blob/40dac699/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp -- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp index 63a41cc..c3df296 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp @@ -39,6 +39,7 @@ import="org.apache.hadoop.hbase.procedure2.util.StringUtils" import="org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos" import="org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil" + import="org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix" %> <% HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); @@ -173,7 +174,7 @@ <%ProcedureWALFile pwf = procedureWALFiles.get(i); %> <%= pwf.getLogId() %> - <%= StringUtils.humanSize(pwf.getSize()) %> + <%= TraditionalBi
hbase git commit: HBASE-19186 Unify to use bytes to show size in master/rs ui
Repository: hbase Updated Branches: refs/heads/master 2a99b87af -> b6011a16f HBASE-19186 Unify to use bytes to show size in master/rs ui Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b6011a16 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b6011a16 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b6011a16 Branch: refs/heads/master Commit: b6011a16fffebae21e56c41206b29d96c0613024 Parents: 2a99b87 Author: Guanghao Zhang Authored: Sun Nov 5 12:41:02 2017 +0800 Committer: Guanghao Zhang Committed: Tue Nov 7 10:07:03 2017 +0800 -- .../tmpl/regionserver/BlockCacheTmpl.jamon | 4 +- .../tmpl/regionserver/ServerMetricsTmpl.jamon | 10 +- .../hbase-webapps/master/procedures.jsp | 9 +- .../hbase-webapps/master/processMaster.jsp | 9 +- .../hbase-webapps/master/processRS.jsp | 228 --- .../resources/hbase-webapps/master/table.jsp| 2 +- .../hbase-webapps/regionserver/processRS.jsp| 9 +- 7 files changed, 23 insertions(+), 248 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/b6011a16/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon -- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon index b4e44d8..5ea5bcc 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon @@ -244,13 +244,13 @@ org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix; Size <% TraditionalBinaryPrefix.long2String(cacheConfig.getBlockCache().getCurrentSize(), "B", 1) %> -Current size of block cache in use (bytes) +Current size of block cache in use Free <% TraditionalBinaryPrefix.long2String(cacheConfig.getBlockCache().getFreeSize(), "B", 1) %> -The total free memory currently available to store more cache entries (bytes) +The total free memory currently available to store more cache entries Count http://git-wip-us.apache.org/repos/asf/hbase/blob/b6011a16/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon -- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon index 2e99d5b..adcfff1 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon @@ -146,7 +146,7 @@ MetricsRegionServerWrapper mWrap; Num. WAL Files -Size. WAL Files (bytes) +Size. WAL Files @@ -165,9 +165,9 @@ MetricsRegionServerWrapper mWrap; Num. Stores Num. Storefiles -Root Index Size (bytes) -Index Size (bytes) -Bloom Size (bytes) +Root Index Size +Index Size +Bloom Size <% mWrap.getNumStores() %> @@ -212,7 +212,7 @@ MetricsHBaseServerWrapper mServerWrap; Priority Call Queue Length General Call Queue Length Replication Call Queue Length -Total Call Queue Size (bytes) +Total Call Queue Size http://git-wip-us.apache.org/repos/asf/hbase/blob/b6011a16/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp -- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp index 63a41cc..c3df296 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp @@ -39,6 +39,7 @@ import="org.apache.hadoop.hbase.procedure2.util.StringUtils" import="org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos" import="org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil" + import="org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix" %> <% HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER); @@ -173,7 +174,7 @@ <%ProcedureWALFile pwf = procedureWALFiles.get(i); %> <%= pwf.getLogId() %> - <%= StringUtils.humanSize(pwf.getSize()) %> + <%= TraditionalBinary
