Repository: hbase Updated Branches: refs/heads/branch-1 72f29f48e -> cf198a65e
Revert "Amend HBASE-15728 Add Per-Table metrics back" This reverts commit 72f29f48ea88346028f69e221efb8765d719fc63. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dfb1af48 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dfb1af48 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dfb1af48 Branch: refs/heads/branch-1 Commit: dfb1af48927a66aa5baa5b182e84327770b3c6c9 Parents: 72f29f4 Author: Andrew Purtell <apurt...@apache.org> Authored: Tue Sep 4 13:12:17 2018 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Tue Sep 4 13:12:17 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/regionserver/MetricsRegionServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/dfb1af48/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java index 3b566ca..9466886 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java @@ -203,7 +203,7 @@ public class MetricsRegionServer { serverSource.updateFlushMemstoreSize(memstoreSize); serverSource.updateFlushOutputSize(fileSize); - if (metricsTable != null && table != null) { + if (table != null) { metricsTable.updateFlushTime(table, memstoreSize); metricsTable.updateFlushMemstoreSize(table, memstoreSize); metricsTable.updateFlushOutputSize(table, fileSize); @@ -218,7 +218,7 @@ public class MetricsRegionServer { serverSource.updateCompactionInputSize(isMajor, inputBytes); serverSource.updateCompactionOutputSize(isMajor, outputBytes); - if (metricsTable != null && table != null) { + if (table != null) { metricsTable.updateCompactionTime(table, isMajor, t); metricsTable.updateCompactionInputFileCount(table, isMajor, inputFileCount); metricsTable.updateCompactionOutputFileCount(table, isMajor, outputFileCount);
