HBASE-29035: Amount of region cached in the region metrics not updated for a region immediately after it is flushed with cacheOnWrite turned on

Author: ragarkar

hbase-server/src/test/java/org/apache/hadoop/hbase/TestCacheEviction.java

@@ -141,7 +141,8 @@ private void doTestEvictOnClose(String table, boolean evictOnClose,
     }
   }
 
-  private void createTable(TableName tableName, boolean shouldFlushTable) throws IOException, InterruptedException {
+  private void createTable(TableName tableName, boolean shouldFlushTable)
+    throws IOException, InterruptedException {
     byte[] family = Bytes.toBytes("CF");
     TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName)
       .setColumnFamily(ColumnFamilyDescriptorBuilder.of(family)).build();
@@ -199,17 +200,17 @@ public void testCacheWithFlush() throws Exception {
 
   private void checkRegionCached(TableName tableName, boolean isCached) throws IOException {
     UTIL.getMiniHBaseCluster().getRegions(tableName).forEach(r -> {
-        try {
-          UTIL.getMiniHBaseCluster().getClusterMetrics().getLiveServerMetrics().forEach((sn, sm) -> {
-            for (Map.Entry<byte[], RegionMetrics> rm : sm.getRegionMetrics().entrySet()) {
-              if (rm.getValue().getNameAsString().equals(r.getRegionInfo().getRegionNameAsString())) {
-                assertTrue(isCached == (rm.getValue().getCurrentRegionCachedRatio() > 0.0f));
-              }
+      try {
+        UTIL.getMiniHBaseCluster().getClusterMetrics().getLiveServerMetrics().forEach((sn, sm) -> {
+          for (Map.Entry<byte[], RegionMetrics> rm : sm.getRegionMetrics().entrySet()) {
+            if (rm.getValue().getNameAsString().equals(r.getRegionInfo().getRegionNameAsString())) {
+              assertTrue(isCached == (rm.getValue().getCurrentRegionCachedRatio() > 0.0f));
             }
-          });
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+          }
+        });
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
     });
   }
 }