diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp index b45d633d08e..3d5e2303bc8 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -159,10 +159,7 @@ if ( fqtn != null ) { table = new HTable(conf, fqtn); if (table.getTableDescriptor().getRegionReplication() > 1) { - tableHeader = "
Name | Region Server | ReadRequests | WriteRequests | StorefileSize | Num.Storefiles | MemSize | Locality | Start Key | End Key | ReplicaID |
---|
Name | Region Server | ReadRequests | WriteRequests | StorefileSize | Num.Storefiles | MemSize | Locality | Start Key | End Key |
---|
Name | +Region Server | +ReadRequests | +WriteRequests | +StorefileSize | +Num.Storefiles | +MemSize | +Locality | +Start Key | +End Key | + <% + if (withReplica) { + %> +ReplicaID | + <% + } + %> +
---|---|---|---|---|---|---|---|---|---|---|
<%= escapeXml(meta.getRegionNameAsString()) %> | -<%= metaLocationString %> | -<%= readReq%> | -<%= writeReq%> | -<%= fileSize%> | -<%= fileCount%> | -<%= memSize%> | -<%= locality%> | -<%= escapeXml(Bytes.toString(meta.getStartKey())) %> | -<%= escapeXml(Bytes.toString(meta.getEndKey())) %> | -<% - if (withReplica) { -%> -<%= meta.getReplicaId() %> | -<% - } -%> -
Name | +Region Server | +Num. Compacting KVs | +Num. Compacted KVs | +Remaining KVs | +Compaction Progress | +
---|---|---|---|---|---|
<%= escapeXml(meta.getRegionNameAsString()) %> | +<%= metaLocationString %> | +<%= String.format("%,1d", compactingKVs)%> | +<%= String.format("%,1d", compactedKVs)%> | +<%= String.format("%,1d", compactingKVs - compactedKVs)%> | +<%= compactionProgress%> | +
Name(<%= String.format("%,1d", regions.size())%>) | -Region Server | -ReadRequests (<%= String.format("%,1d", totalReadReq)%>) |
-WriteRequests (<%= String.format("%,1d", totalWriteReq)%>) |
-StorefileSize (<%= StringUtils.byteDesc(totalSize*1024l*1024)%>) |
-Num.Storefiles (<%= String.format("%,1d", totalStoreFileCount)%>) |
-MemSize (<%= StringUtils.byteDesc(totalMemSize*1024l*1024)%>) |
-Locality | -Start Key | -End Key | -<% - if (withReplica) { -%> -ReplicaID | -<% - } -%> -
---|
Name(<%= String.format("%,1d", regions.size())%>) | +Region Server | +ReadRequests (<%= String.format("%,1d", totalReadReq)%>) |
+ WriteRequests (<%= String.format("%,1d", totalWriteReq)%>) |
+ StorefileSize (<%= StringUtils.byteDesc(totalSize*1024l*1024)%>) |
+ Num.Storefiles (<%= String.format("%,1d", totalStoreFileCount)%>) |
+ MemSize (<%= StringUtils.byteDesc(totalMemSize*1024l*1024)%>) |
+ Locality | +Start Key | +End Key | + <% + if (withReplica) { + %> +ReplicaID | + <% + } + %> +|
---|---|---|---|---|---|---|---|---|---|---|---|
<%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> | + <% + if (urlRegionServer != null) { + %> ++ <%= StringEscapeUtils.escapeHtml(addr.getHostname().toString()) + ":" + master.getRegionServerInfoPort(addr) %> + | + <% + } else { + %> +not deployed | + <% + } + %> +<%= readReq%> | +<%= writeReq%> | +<%= regionSize%> | +<%= fileCount%> | +<%= memSize%> | +<%= locality%> | +<%= escapeXml(Bytes.toStringBinary(regionInfo.getStartKey()))%> | +<%= escapeXml(Bytes.toStringBinary(regionInfo.getEndKey()))%> | + <% + if (withReplica) { + %> +<%= regionInfo.getReplicaId() %> | + <% + } + %> +
This table has <%= numRegions %> regions in total, in order to improve the page load time, + only <%= numRegionsRendered %> regions are displayed here, click + here to see all regions.
+ <% } %> +Name(<%= String.format("%,1d", regions.size())%>) | +Region Server | +Num. Compacting KVs (<%= String.format("%,1d", totalCompactingKVs)%>) |
+ Num. Compacted KVs (<%= String.format("%,1d", totalCompactedKVs)%>) |
+ Remaining KVs (<%= String.format("%,1d", totalCompactingKVs - totalCompactedKVs)%>) |
+ Compaction Progress (<%= percentDone %>) |
+ ||||||
---|---|---|---|---|---|---|---|---|---|---|---|
<%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> | - <% - if (urlRegionServer != null) { - %> -- <%= StringEscapeUtils.escapeHtml(addr.getHostname().toString()) + ":" + master.getRegionServerInfoPort(addr) %> - | - <% - } else { - %> -not deployed | - <% - } - %> -<%= readReq%> | -<%= writeReq%> | -<%= regionSize%> | -<%= fileCount%> | -<%= memSize%> | -<%= locality%> | -<%= escapeXml(Bytes.toStringBinary(regionInfo.getStartKey()))%> | -<%= escapeXml(Bytes.toStringBinary(regionInfo.getEndKey()))%> | - <% - if (withReplica) { - %> -<%= regionInfo.getReplicaId() %> | - <% - } - %> -
This table has <%= numRegions %> regions in total, in order to improve the page load time, - only <%= numRegionsRendered %> regions are displayed here, click - here to see all regions.
-<% } %> + if (addr != null) { + // This port might be wrong if RS actually ended up using something else. + urlRegionServer = + "//" + URLEncoder.encode(addr.getHostname()) + ":" + master.getRegionServerInfoPort(addr) + "/"; + } + if (numRegionsRendered < numRegionsToRender) { + numRegionsRendered++; + %> +This table has <%= numRegions %> regions in total, in order to improve the page load time, + only <%= numRegionsRendered %> regions are displayed here, click + here to see all regions.
+ <% } %> + + +