Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
liuml07 wants to merge 3 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e9d36b
HBASE-24696 Include JVM information on Web UI under "Software Attribu…
liuml07 Jul 18, 2020
ba52cb3
Fix typo found by Viraj Jasani
liuml07 Jul 18, 2020
4d4bd9b
Address comments
liuml07 Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"%>
<%
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/tool/CanaryStatusTmpl.jamon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]>
Expand Down Expand Up @@ -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>
Expand Down
9 changes: 9 additions & 0 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/util/JvmVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,13 @@ 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() {
Copy link
Member

@ndimiduk ndimiduk Jul 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the javadoc in the class header, this is a repurposing of the existing class. I think it's fine to put this method into this class, as the name and location of the class seem like a reasonable place to find this information. Can you update the javadoc on the class header according to the expanded scope of the class?

Otherwise, +1.

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 changes: 6 additions & 0 deletions hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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>
Expand Down