You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wa...@apache.org on 2021/01/08 11:04:37 UTC
[hbase] branch branch-2.3 updated: HBASE-25434 SlowDelete & SlowPut
metric value should use updateDelete & updatePut (#2837)
This is an automated email from the ASF dual-hosted git repository.
wangzheng pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 4cd1809 HBASE-25434 SlowDelete & SlowPut metric value should use updateDelete & updatePut (#2837)
4cd1809 is described below
commit 4cd18091c41924a113921a28cdeec6e782048ccc
Author: xijiawen <15...@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 <wa...@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 a2781e6..4204763 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
@@ -117,9 +117,6 @@ public class MetricsRegionServer {
if (tableMetrics != null && tn != null) {
tableMetrics.updatePutBatch(tn, t);
}
- if (t > slowMetricTime) {
- serverSource.incrSlowPut();
- }
serverSource.updatePutBatch(t);
}
@@ -127,6 +124,9 @@ public class MetricsRegionServer {
if (tableMetrics != null && tn != null) {
tableMetrics.updatePut(tn, t);
}
+ if (t > slowMetricTime) {
+ serverSource.incrSlowPut();
+ }
serverSource.updatePut(t);
userAggregate.updatePut(t);
}
@@ -135,6 +135,9 @@ public class MetricsRegionServer {
if (tableMetrics != null && tn != null) {
tableMetrics.updateDelete(tn, t);
}
+ if (t > slowMetricTime) {
+ serverSource.incrSlowDelete();
+ }
serverSource.updateDelete(t);
userAggregate.updateDelete(t);
}
@@ -143,9 +146,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 ab22c8e..5fce73c 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);
}
@@ -158,17 +160,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("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