Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-24696 Include JVM information on Web UI under "Software Attributes" 

Closes #2087

Signed-off-by: Viraj Jasani <vjasani@apache.org>
Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
This commit is contained in:
Mingliang Liu 2020-07-21 16:49:04 +05:30 committed by Viraj Jasani
parent fccd03ffa2
commit 3d270ba6f9
No known key found for this signature in database
GPG Key ID: B3D6C0B41C8ADFD5
6 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
View File

@ -20,6 +20,7 @@
<%@ page contentType="text/html;charset=UTF-8"
import="org.apache.hadoop.conf.Configuration"
import="org.apache.hadoop.hbase.HBaseConfiguration"
import="org.apache.hadoop.hbase.rest.model.VersionModel"
import="org.apache.hadoop.hbase.util.VersionInfo"
import="java.util.Date"%>
<%
@ -83,6 +84,11 @@ String listenPort = conf.get("hbase.rest.port", "8080");
<th>Value</th>
<th>Description</th>
</tr>
<tr>
<td>JVM Version</td>
<td><%= new VersionModel(getServletContext()).getJVMVersion() %></td>
<td>JVM vendor and version</td>
</tr>
<tr>
<td>HBase Version</td>
<td><%= VersionInfo.getVersion() %>, revision=<%= VersionInfo.getRevision() %></td>

5
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View File

@ -299,6 +299,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<th>Value</th>
<th>Description</th>
</tr>
<tr>
<td>JVM Version</td>
<td><% JvmVersion.getVersion() %></td>
<td>JVM vendor and version</td>
</tr>
<tr>
<td>HBase Version</td>
<td><% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and revision</td>

6
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
View File

@ -32,6 +32,7 @@ org.apache.hadoop.hbase.HBaseConfiguration;
org.apache.hadoop.hbase.io.hfile.CacheConfig;
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ServerInfo;
org.apache.hadoop.hbase.util.JvmVersion;
org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
</%import>
<%doc>If json AND bcn is NOT an empty string presume it a block cache view request.</%doc>
@ -165,6 +166,11 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
<th>Value</th>
<th>Description</th>
</tr>
<tr>
<td>JVM Version</td>
<td><% JvmVersion.getVersion() %></td>
<td>JVM vendor and version</td>
</tr>
<tr>
<td>HBase Version</td>
<td><% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, revision=<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td>

6
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon
View File

@ -25,6 +25,7 @@ java.util.Map;
java.util.concurrent.atomic.LongAdder;
org.apache.hadoop.hbase.ServerName;
org.apache.hadoop.hbase.tool.CanaryTool.RegionStdOutSink;
org.apache.hadoop.hbase.util.JvmVersion;
</%import>
<!--[if IE]>
@ -109,6 +110,11 @@ org.apache.hadoop.hbase.tool.CanaryTool.RegionStdOutSink;
<th>Value</th>
<th>Description</th>
</tr>
<tr>
<td>JVM Version</td>
<td><% JvmVersion.getVersion() %></td>
<td>JVM vendor and version</td>
</tr>
<tr>
<td>HBase Version</td>
<td><% org.apache.hadoop.hbase.util.VersionInfo.getVersion() %>, r<% org.apache.hadoop.hbase.util.VersionInfo.getRevision() %></td><td>HBase version and revision</td>

15
hbase-server/src/main/java/org/apache/hadoop/hbase/util/JvmVersion.java
View File

@ -25,9 +25,7 @@ import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
/**
* Certain JVM versions are known to be unstable with HBase. This
* class has a utility function to determine whether the current JVM
* is known to be unstable.
* Utility class to get and check the current JVM version.
*/
@InterfaceAudience.Private
@InterfaceStability.Stable
@ -38,10 +36,19 @@ public abstract class JvmVersion {
}
/**
* Return true if the current JVM is known to be unstable.
* Return true if the current JVM version is known to be unstable with HBase.
*/
public static boolean isBadJvmVersion() {
String version = System.getProperty("java.version");
return version != null && BAD_JVM_VERSIONS.contains(version);
}
/**
* Return the current JVM version information.
*/
public static String getVersion() {
return System.getProperty("java.vm.vendor", "UNKNOWN_VM_VENDOR") + ' ' +
System.getProperty("java.version", "UNKNOWN_JAVA_VERSION") + '-' +
System.getProperty("java.vm.version", "UNKNOWN_VM_VERSION");
}
}

6
hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
View File

@ -24,6 +24,7 @@
import="java.util.Date"
%>
<%@ page import="org.apache.hadoop.hbase.thrift.ImplType" %>
<%@ page import="org.apache.hadoop.hbase.util.JvmVersion" %>
<%
Configuration conf = (Configuration)getServletContext().getAttribute("hbase.conf");
@ -99,6 +100,11 @@ String qop = conf.get("hbase.thrift.security.qop", "None");
<th>Value</th>
<th>Description</th>
</tr>
<tr>
<td>JVM Version</td>
<td><%= JvmVersion.getVersion() %></td>
<td>JVM vendor and version information</td>
</tr>
<tr>
<td>HBase Version</td>
<td><%= VersionInfo.getVersion() %>, r<%= VersionInfo.getRevision() %></td>