HBASE-23184 The HeapAllocation in WebUI is not accurate

hbase-common/src/main/java/org/apache/hadoop/hbase/io/ByteBuffAllocator.java

@@ -254,6 +254,14 @@ public int getTotalBufferCount() {
     return maxBufCount;
   }
 
+  public static long getHeapAllocationBytes(ByteBuffAllocator... allocators) {
+    long heapAllocBytes = 0;
+    for (ByteBuffAllocator alloc : Sets.newHashSet(allocators)) {
+      heapAllocBytes += alloc.getHeapAllocationBytes();
+    }
+    return heapAllocBytes;
+  }
+
   public static double getHeapAllocationRatio(ByteBuffAllocator... allocators) {
     double heapDelta = 0.0, poolDelta = 0.0;
     long heapAllocBytes, poolAllocBytes;

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon

@@ -246,7 +246,7 @@ ByteBuffAllocator bbAllocator;
     <th>Buffer Size(Bytes)</th>
 </tr>
 <tr>
-    <td><% bbAllocator.getHeapAllocationBytes() %></td>
+    <td><% ByteBuffAllocator.getHeapAllocationBytes(bbAllocator, ByteBuffAllocator.HEAP) %></td>
     <td><% bbAllocator.getPoolAllocationBytes() %></td>
     <td><% String.format("%.3f", ByteBuffAllocator.getHeapAllocationRatio(bbAllocator, ByteBuffAllocator.HEAP) * 100) %><% "%" %></td>
     <td><% bbAllocator.getTotalBufferCount() %></td>

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java

@@ -1010,7 +1010,7 @@ public long getTrailerHitCount() {
 
   @Override
   public long getByteBuffAllocatorHeapAllocationBytes() {
-    return this.allocator.getHeapAllocationBytes();
+    return ByteBuffAllocator.getHeapAllocationBytes(allocator, ByteBuffAllocator.HEAP);
   }
 
   @Override