From 1f57c5d52d8d4058e03964f121fdd7e14618a7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Paksy?= Results: " + "Results
");
out.println(MARKER + "Submitted Log Name: " + logName + "
");
Logger log = LoggerFactory.getLogger(logName);
@@ -373,23 +373,28 @@ private void sendError(HttpServletResponse response, int code, String message)
static final String FORMS = "Get/Set Log Level
\n" + "\n" + "
\n" + "\n" + "\n"
- + " \n" + "\n" + "\n"
- + " \n" + "
\n";
+ + "Get/Set Log Level
\n" + "Actions
\n"
+ + "\n" + "
\n";
private static void process(Logger logger, String levelName, PrintWriter out) {
if (levelName != null) {
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
index 067ed3d0c66d..8be266c787ef 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
@@ -54,19 +54,11 @@ http://www.vectorportal.com/subcategory/205/KILLER-WHALE-FREE-VECTOR.eps/ifile/9
## For modules that have bootstrap in their source tree
#macro(bootstrap_notice)
--
-This product includes portions of the Bootstrap project v3.0.0
+This product includes portions of the Bootstrap project v5.3.3
-Copyright 2013 Twitter, Inc.
+Copyright 2011-2024 The Bootstrap Authors
-Licensed under the Apache License v2.0
-
-This product uses the Glyphicons Halflings icon set.
-
-http://glyphicons.com/
-
-Copyright Jan Kovařík
-
-Licensed under the Apache License v2.0 as a part of the Bootstrap project.
+Licensed under the MIT license
#end
## no NOTICE file.
#macro(findbugs_cleanroom_notice)
diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp
index 80ca464aad06..55d8fec75247 100644
--- a/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp
+++ b/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp
@@ -23,8 +23,8 @@
| Collection Count | @@ -129,7 +129,7 @@ pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil.
|---|
| Collection Count | diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp index ce6725f283a7..b5a706d3513c 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp @@ -30,7 +30,7 @@ final RESTServer restServer = (RESTServer) getServletContext().getAttribute(RESTServer.REST_SERVER); final String hostName = restServer.getServerName().getHostname(); - pageContext.setAttribute("pageTitle", "HBase REST Server" + hostName); + pageContext.setAttribute("pageTitle", "HBase REST Server: " + hostName); %>
|---|
Balancer Decision displayed the history of decision(factor details and weights and costs) made by LoadBalancers
| Collection Count | @@ -127,7 +127,7 @@ pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil.
|---|
| Collection Count | diff --git a/hbase-server/src/main/resources/hbase-webapps/master/quotas.jsp b/hbase-server/src/main/resources/hbase-webapps/master/quotas.jsp index 575994f50c1e..1c5bfb6647b6 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/quotas.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/quotas.jsp @@ -73,11 +73,11 @@ <%if (quotaManager.isRpcThrottleEnabled()) {%> -
|---|
| ServerName | @@ -204,7 +204,7 @@
|---|
| ServerName | @@ -258,7 +258,7 @@ } %>
|---|
| ServerName | @@ -296,7 +296,7 @@ } %>
|---|
| ServerName | @@ -372,7 +372,7 @@ } %>
|---|
| ServerName | diff --git a/hbase-server/src/main/resources/hbase-webapps/master/startupProgress.jsp b/hbase-server/src/main/resources/hbase-webapps/master/startupProgress.jsp index f44d67cf848c..2302284a8a05 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/startupProgress.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/startupProgress.jsp @@ -27,6 +27,7 @@ <%@ page import="org.apache.hadoop.hbase.monitoring.TaskGroup" %> <% final HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER); + pageContext.setAttribute("pageTitle", "HBase Master Startup Progress: " + master.getServerName()); %>
|---|
| Name | -Region Server | -ReadRequests | -WriteRequests | -Uncompressed StoreFileSize | -StorefileSize | -Num.Storefiles | -MemSize | -Start Key | -End Key | -ReplicaID | -
|---|
| Name | +Region Server | +ReadRequests | +WriteRequests | +Uncompressed StoreFileSize | +StorefileSize | +Num.Storefiles | +MemSize | +Start Key | +End Key | +ReplicaID | +
|---|---|---|---|---|---|---|---|---|---|---|
| <%= escapeXml(meta.getRegionNameAsString()) %> | -<%= StringEscapeUtils.escapeHtml4(hostAndPort) %> | -<%= readReq%> | -<%= writeReq%> | -<%= fileSizeUncompressed%> | -<%= fileSize%> | -<%= fileCount%> | -<%= memSize%> | -<%= escapeXml(Bytes.toString(meta.getStartKey())) %> | -<%= escapeXml(Bytes.toString(meta.getEndKey())) %> | -<%= meta.getReplicaId() %> | -
| Name | -Region Server | -Locality | -LocalityForSsd | -|||||||
|---|---|---|---|---|---|---|---|---|---|---|
| <%= escapeXml(meta.getRegionNameAsString()) %> | +<%= StringEscapeUtils.escapeHtml4(hostAndPort) %> | +<%= readReq%> | +<%= writeReq%> | +<%= fileSizeUncompressed%> | +<%= fileSize%> | +<%= fileCount%> | +<%= memSize%> | +<%= escapeXml(Bytes.toString(meta.getStartKey())) %> | +<%= escapeXml(Bytes.toString(meta.getEndKey())) %> | +<%= meta.getReplicaId() %> | +
| Name | +Region Server | +Locality | +LocalityForSsd | +
|---|---|---|---|
| <%= escapeXml(meta.getRegionNameAsString()) %> | -<%= StringEscapeUtils.escapeHtml4(hostAndPort) %> | -<%= locality%> | -<%= localityForSsd%> | -
| Name | -Region Server | -Num. Compacting Cells | -Num. Compacted Cells | -Remaining Cells | -Compaction Progress | -
|---|---|---|---|---|---|
| <%= escapeXml(meta.getRegionNameAsString()) %> | +<%= StringEscapeUtils.escapeHtml4(hostAndPort) %> | +<%= locality%> | +<%= localityForSsd%> | +
| Name | +Region Server | +Num. Compacting Cells | +Num. Compacted Cells | +Remaining Cells | +Compaction Progress | +
|---|---|---|---|---|---|
| <%= escapeXml(meta.getRegionNameAsString()) %> | -<%= StringEscapeUtils.escapeHtml4(hostAndPort) %> | -<%= String.format("%,1d", compactingCells)%> | -<%= String.format("%,1d", compactedCells)%> | -<%= String.format("%,1d", compactingCells - compactedCells)%> | -<%= compactionProgress%> | -
| Name(<%= String.format("%,1d", regions.size())%>) | -Region Server | -ReadRequests (<%= String.format("%,1d", totalReadReq)%>) |
- WriteRequests (<%= String.format("%,1d", totalWriteReq)%>) |
- Uncompressed StoreFileSize (<%= totalSizeUncompressedStr %>) |
- StorefileSize (<%= totalSizeStr %>) |
- Num.Storefiles (<%= String.format("%,1d", totalStoreFileCount)%>) |
- MemSize (<%= totalMemSizeStr %>) |
- Start Key | -End Key | -Region State | -ReplicaID | -
|---|
| Name(<%= String.format("%,1d", regions.size())%>) | +Region Server | +ReadRequests (<%= String.format("%,1d", totalReadReq)%>) |
+ WriteRequests (<%= String.format("%,1d", totalWriteReq)%>) |
+ Uncompressed StoreFileSize (<%= totalSizeUncompressedStr %>) |
+ StorefileSize (<%= totalSizeStr %>) |
+ Num.Storefiles (<%= String.format("%,1d", totalStoreFileCount)%>) |
+ MemSize (<%= totalMemSizeStr %>) |
+ Start Key | +End Key | +Region State | +ReplicaID | +
|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> | - <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %> -<%= readReq%> | -<%= writeReq%> | -<%= regionSizeUncompressed%> | -<%= regionSize%> | -<%= fileCount%> | -<%= memSize%> | -<%= escapeXml(Bytes.toStringBinary(regionInfo.getStartKey()))%> | -<%= escapeXml(Bytes.toStringBinary(regionInfo.getEndKey()))%> | -<%= state%> | -<%= regionInfo.getReplicaId() %> | -
| Name(<%= String.format("%,1d", regions.size())%>) | -Region Server | -Locality (<%= totalLocality %>) |
- LocalityForSsd (<%= totalLocalityForSsd %>) |
- |||||||
|---|---|---|---|---|---|---|---|---|---|---|
| <%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> | + <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %> +<%= readReq%> | +<%= writeReq%> | +<%= regionSizeUncompressed%> | +<%= regionSize%> | +<%= fileCount%> | +<%= memSize%> | +<%= escapeXml(Bytes.toStringBinary(regionInfo.getStartKey()))%> | +<%= escapeXml(Bytes.toStringBinary(regionInfo.getEndKey()))%> | +<%= state%> | +<%= regionInfo.getReplicaId() %> | +
| Name(<%= String.format("%,1d", regions.size())%>) | +Region Server | +Locality (<%= totalLocality %>) |
+ LocalityForSsd (<%= totalLocalityForSsd %>) |
+
|---|---|---|---|
| <%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> | - <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %> -<%= locality%> | -<%= localityForSsd%> | -
| Name(<%= String.format("%,1d", regions.size())%>) | -Region Server | -Num. Compacting Cells (<%= String.format("%,1d", totalCompactingCells)%>) |
- Num. Compacted Cells (<%= String.format("%,1d", totalCompactedCells)%>) |
- Remaining Cells (<%= String.format("%,1d", totalCompactingCells-totalCompactedCells)%>) |
- Compaction Progress (<%= totalCompactionProgress %>) |
-
|---|---|---|---|---|---|
| <%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> | + <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %> +<%= locality%> | +<%= localityForSsd%> | +
| Name(<%= String.format("%,1d", regions.size())%>) | +Region Server | +Num. Compacting Cells (<%= String.format("%,1d", totalCompactingCells)%>) |
+ Num. Compacted Cells (<%= String.format("%,1d", totalCompactedCells)%>) |
+ Remaining Cells (<%= String.format("%,1d", totalCompactingCells-totalCompactedCells)%>) |
+ Compaction Progress (<%= totalCompactionProgress %>) |
+
|---|---|---|---|---|---|
| <%= escapeXml(Bytes.toStringBinary(regionInfo.getRegionName())) %> | - <%= buildRegionDeployedServerTag(regionInfo, master, regionsToServer) %> -<%= String.format("%,1d", compactingCells)%> | -<%= String.format("%,1d", compactedCells)%> | -<%= String.format("%,1d", compactingCells - compactedCells)%> | -<%= compactionProgress%> | -
-
| - - | -- - | -- This action will force a major compaction of all regions of the table, or, - if a key is supplied, only the region major containing the - given key. - | -
| - - | -- - | -- This action will force a compaction of all regions of the table, or, - if a key is supplied, only the region containing the - given key. - | -
| - - | -- - | -- This action will force a split of all eligible - regions of the table, or, if a key is supplied, only the region containing the - given key. An eligible region is one that does not contain any references to - other regions. Split requests for noneligible regions will be ignored. - | -
| - - | -- - - | -- This action will merge two regions of the table, Merge requests for - noneligible regions will be ignored. - | -
| + + | ++ + | ++ This action will force a major compaction of all regions of the table, or, + if a key is supplied, only the region major containing the + given key. + | +
| + + | ++ + | ++ This action will force a compaction of all regions of the table, or, + if a key is supplied, only the region containing the + given key. + | +
| + + | ++ + | ++ This action will force a split of all eligible + regions of the table, or, if a key is supplied, only the region containing the + given key. An eligible region is one that does not contain any references to + other regions. Split requests for noneligible regions will be ignored. + | +
| + + | ++ + + | ++ This action will merge two regions of the table, Merge requests for + noneligible regions will be ignored. + | +
-
- | Collection Count | @@ -134,7 +134,7 @@ pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil.
|---|
| Collection Count | diff --git a/hbase-server/src/main/resources/hbase-webapps/regionserver/rsOperationDetails.jsp b/hbase-server/src/main/resources/hbase-webapps/regionserver/rsOperationDetails.jsp index abdab7df7d69..87f6cf4f8aef 100644 --- a/hbase-server/src/main/resources/hbase-webapps/regionserver/rsOperationDetails.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/regionserver/rsOperationDetails.jsp @@ -81,16 +81,16 @@
|---|
Large response RPCs record those RPCs whose returned data size is greater than the threshold (see the setting'hbase.ipc.warn.response.size' for details)