Skip to content

Commit 399cba5

Browse files
committed
HBASE-29038 Fix NPE in processRS.jsp due to missing MBean value
1 parent 2990a0f commit 399cba5

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

  • hbase-server/src/main/resources/hbase-webapps/regionserver

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

Lines changed: 4 additions & 2 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();
@@ -68,8 +70,8 @@ pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil.
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 : -1 %></td>
7375
<td><%= runtimeBean.getSystemProperties().get("user.name") %></td>
7476
</tr>
7577
</table>

0 commit comments

Comments
 (0)