Skip to content

Commit c9f7dad

Browse files
authored
HBASE-29038 Fix NPE in processRS.jsp due to missing MBean value (apache#6556)
Signed-off-by: Duo Zhang <[email protected]>
1 parent d59814c commit c9f7dad

File tree

1 file changed

+5
-3
lines changed
  • hbase-server/src/main/resources/hbase-webapps/regionserver

1 file changed

+5
-3
lines changed

hbase-server/src/main/resources/hbase-webapps/regionserver/processRS.jsp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean();
3434
ObjectName jvmMetrics = new ObjectName("Hadoop:service=HBase,name=JvmMetrics");
3535
ObjectName rsMetrics = new ObjectName("Hadoop:service=HBase,name=RegionServer,sub=Server");
36+
Object pauseWarnThresholdExceeded = JSONMetricUtil.getValueFromMBean(rsMetrics, "pauseWarnThresholdExceeded");
37+
Object pauseInfoThresholdExceeded = JSONMetricUtil.getValueFromMBean(rsMetrics, "pauseInfoThresholdExceeded");
3638
3739
// There is always two of GC collectors
3840
List<GarbageCollectorMXBean> gcBeans = JSONMetricUtil.getGcCollectorBeans();
@@ -60,16 +62,16 @@ pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil.
6062
<th>Started</th>
6163
<th>Uptime</th>
6264
<th>PID</th>
63-
<th>JvmPauseMonitor Count </th>
65+
<th>JvmPauseMonitor Count</th>
6466
<th>Owner</th>
6567
</tr>
6668
<tr>
6769
<tr>
6870
<td><%= new Date(runtimeBean.getStartTime()) %></td>
6971
<td><%= StringUtils.humanTimeDiff(runtimeBean.getUptime()) %></td>
7072
<td><%= JSONMetricUtil.getProcessPID() %></td>
71-
<td><%= (long)JSONMetricUtil.getValueFromMBean(rsMetrics, "pauseWarnThresholdExceeded")
72-
+ (long)JSONMetricUtil.getValueFromMBean(rsMetrics, "pauseInfoThresholdExceeded") %></td>
73+
<td><%= pauseWarnThresholdExceeded != null && pauseInfoThresholdExceeded != null ?
74+
(long)pauseWarnThresholdExceeded + (long)pauseInfoThresholdExceeded : 0 %></td>
7375
<td><%= runtimeBean.getSystemProperties().get("user.name") %></td>
7476
</tr>
7577
</table>

0 commit comments

Comments
 (0)