You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/09/04 19:52:37 UTC
hbase git commit: Amend HBASE-15728 Add Per-Table metrics back
Repository: hbase
Updated Branches:
refs/heads/branch-1 484a1d804 -> 72f29f48e
Amend HBASE-15728 Add Per-Table metrics back
Fix a NPE surfaced by TestRegionLocationFinder
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/72f29f48
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/72f29f48
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/72f29f48
Branch: refs/heads/branch-1
Commit: 72f29f48ea88346028f69e221efb8765d719fc63
Parents: 484a1d8
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Sep 4 12:48:03 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Sep 4 12:48:10 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/72f29f48/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 9466886..3b566ca 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 (table != null) {
+ if (metricsTable != null && 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 (table != null) {
+ if (metricsTable != null && table != null) {
metricsTable.updateCompactionTime(table, isMajor, t);
metricsTable.updateCompactionInputFileCount(table, isMajor, inputFileCount);
metricsTable.updateCompactionOutputFileCount(table, isMajor, outputFileCount);