This is an automated email from the ASF dual-hosted git repository. wangzheng pushed a commit to branch branch-2 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push: new 4705b47 HBASE-25434 SlowDelete & SlowPut metric value should use updateDelete & updatePut (#2837) 4705b47 is described below commit 4705b4752b4046b7d1954afd6711948450515980 Author: xijiawen <15891721...@163.com> AuthorDate: Fri Jan 8 18:58:30 2021 +0800 HBASE-25434 SlowDelete & SlowPut metric value should use updateDelete & updatePut (#2837) Signed-off-by: Zheng Wang <wangzh...@apache.org> (cherry picked from commit 7d70141b90d188d69e259ad5de435dad4eed5bf8) --- .../hadoop/hbase/regionserver/MetricsRegionServer.java | 12 ++++++------ .../hadoop/hbase/regionserver/TestMetricsRegionServer.java | 10 ++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) 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 68b0890..7a76592 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 @@ -113,9 +113,6 @@ public class MetricsRegionServer { if (tableMetrics != null && tn != null) { tableMetrics.updatePutBatch(tn, t); } - if (t > slowMetricTime) { - serverSource.incrSlowPut(); - } serverSource.updatePutBatch(t); } @@ -123,6 +120,9 @@ public class MetricsRegionServer { if (tableMetrics != null && tn != null) { tableMetrics.updatePut(tn, t); } + if (t > slowMetricTime) { + serverSource.incrSlowPut(); + } serverSource.updatePut(t); userAggregate.updatePut(t); } @@ -131,6 +131,9 @@ public class MetricsRegionServer { if (tableMetrics != null && tn != null) { tableMetrics.updateDelete(tn, t); } + if (t > slowMetricTime) { + serverSource.incrSlowDelete(); + } serverSource.updateDelete(t); userAggregate.updateDelete(t); } @@ -139,9 +142,6 @@ public class MetricsRegionServer { if (tableMetrics != null && tn != null) { tableMetrics.updateDeleteBatch(tn, t); } - if (t > slowMetricTime) { - serverSource.incrSlowDelete(); - } serverSource.updateDeleteBatch(t); } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java index 276da2b..e8d7bfe 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java @@ -149,6 +149,8 @@ public class TestMetricsRegionServer { for (int i=0; i < 17; i ++) { rsm.updatePut(null, 17); rsm.updateDelete(null, 17); + rsm.updatePut(null, 1006); + rsm.updateDelete(null, 1003); rsm.updateCheckAndDelete(null, 17); rsm.updateCheckAndPut(null, 17); rsm.updateCheckAndMutate(null, 17); @@ -159,17 +161,17 @@ public class TestMetricsRegionServer { HELPER.assertCounter("getNumOps", 28, serverSource); HELPER.assertCounter("incrementNumOps", 30, serverSource); HELPER.assertCounter("putBatchNumOps", 32, serverSource); - HELPER.assertCounter("putNumOps", 17, serverSource); - HELPER.assertCounter("deleteNumOps", 17, serverSource); + HELPER.assertCounter("putNumOps", 34, serverSource); + HELPER.assertCounter("deleteNumOps", 34, serverSource); HELPER.assertCounter("checkAndDeleteNumOps", 17, serverSource); HELPER.assertCounter("checkAndPutNumOps", 17, serverSource); HELPER.assertCounter("checkAndMutateNumOps", 17, serverSource); HELPER.assertCounter("slowAppendCount", 12, serverSource); - HELPER.assertCounter("slowDeleteCount", 13, serverSource); + HELPER.assertCounter("slowDeleteCount", 17, serverSource); HELPER.assertCounter("slowGetCount", 14, serverSource); HELPER.assertCounter("slowIncrementCount", 15, serverSource); - HELPER.assertCounter("slowPutCount", 16, serverSource); + HELPER.assertCounter("slowPutCount", 17, serverSource); } @Test