From e81418d99bc550240c1ceeeed74658a6e0ffbc53 Mon Sep 17 00:00:00 2001 From: tianhang Date: Tue, 14 Mar 2023 13:51:36 +0800 Subject: [PATCH 1/2] HBASE-27712 Remove unused params in region metrics --- .../hadoop/hbase/regionserver/MetricsRegionSource.java | 9 ++++----- .../hbase/regionserver/MetricsRegionSourceImpl.java | 4 ++-- .../org/apache/hadoop/hbase/regionserver/HRegion.java | 9 ++++----- .../apache/hadoop/hbase/regionserver/MetricsRegion.java | 8 ++++---- .../apache/hadoop/hbase/regionserver/RSRpcServices.java | 8 ++++---- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java index c3d955592d6a..580b4a7624fe 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java @@ -73,15 +73,14 @@ public interface MetricsRegionSource extends Comparable { void updateDelete(); /** - * Update time of gets - * @param mills time for this get operation. + * Update related counts of gets */ - void updateGet(long mills); + void updateGet(); /** - * Update time used of resultScanner.next(). + * Update related counts of resultScanner.next(). */ - void updateScanTime(long mills); + void updateScan(); /** * Update related counts of increments. diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java index 6933241842ce..410d775d7d32 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java @@ -149,12 +149,12 @@ public void updateDelete() { } @Override - public void updateGet(long mills) { + public void updateGet() { regionGet.incr(); } @Override - public void updateScanTime(long mills) { + public void updateScan() { regionScan.incr(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 809f2bc5029e..0dc96747dd36 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -7912,12 +7912,11 @@ private List get(Get get, boolean withCoprocessor, long nonceGroup, long n private List getInternal(Get get, boolean withCoprocessor, long nonceGroup, long nonce) throws IOException { List results = new ArrayList<>(); - long before = EnvironmentEdgeManager.currentTime(); // pre-get CP hook if (withCoprocessor && (coprocessorHost != null)) { if (coprocessorHost.preGet(get, results)) { - metricsUpdateForGet(results, before); + metricsUpdateForGet(); return results; } } @@ -7941,14 +7940,14 @@ private List getInternal(Get get, boolean withCoprocessor, long nonceGroup coprocessorHost.postGet(get, results); } - metricsUpdateForGet(results, before); + metricsUpdateForGet(); return results; } - void metricsUpdateForGet(List results, long before) { + void metricsUpdateForGet() { if (this.metricsRegion != null) { - this.metricsRegion.updateGet(EnvironmentEdgeManager.currentTime() - before); + this.metricsRegion.updateGet(); } if (this.rsServices != null && this.rsServices.getMetrics() != null) { rsServices.getMetrics().updateReadQueryMeter(this, 1); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java index a5a986369ef5..ab934fecc9e4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java @@ -50,12 +50,12 @@ public void updateDelete() { source.updateDelete(); } - public void updateGet(final long t) { - source.updateGet(t); + public void updateGet() { + source.updateGet(); } - public void updateScanTime(final long t) { - source.updateScanTime(t); + public void updateScanCount() { + source.updateScan(); } public void updateFilteredRecords() { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index 87879d638de9..5de294e1410f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -2518,11 +2518,10 @@ private Result get(Get get, HRegion region, RegionScannersCloseCallBack closeCal // This method is almost the same as HRegion#get. List results = new ArrayList<>(); - long before = EnvironmentEdgeManager.currentTime(); // pre-get CP hook if (region.getCoprocessorHost() != null) { if (region.getCoprocessorHost().preGet(get, results)) { - region.metricsUpdateForGet(results, before); + region.metricsUpdateForGet(); return Result.create(results, get.isCheckExistenceOnly() ? !results.isEmpty() : null, stale); } @@ -2557,7 +2556,7 @@ private Result get(Get get, HRegion region, RegionScannersCloseCallBack closeCal if (region.getCoprocessorHost() != null) { region.getCoprocessorHost().postGet(get, results); } - region.metricsUpdateForGet(results, before); + region.metricsUpdateForGet(); return Result.create(results, get.isCheckExistenceOnly() ? !results.isEmpty() : null, stale); } @@ -3461,13 +3460,14 @@ private void scan(HBaseRpcController controller, ScanRequest request, RegionScan region.closeRegionOperation(); // Update serverside metrics, even on error. long end = EnvironmentEdgeManager.currentTime(); + long responseCellSize = 0; long blockBytesScanned = 0; if (rpcCall != null) { responseCellSize = rpcCall.getResponseCellSize(); blockBytesScanned = rpcCall.getBlockBytesScanned(); } - region.getMetrics().updateScanTime(end - before); + region.getMetrics().updateScanCount(); final MetricsRegionServer metricsRegionServer = server.getMetrics(); if (metricsRegionServer != null) { metricsRegionServer.updateScan(region, end - before, responseCellSize, blockBytesScanned); From d0513fcd367d8c689212075578d27f0adba5c68a Mon Sep 17 00:00:00 2001 From: tianhang Date: Fri, 26 May 2023 17:41:14 +0800 Subject: [PATCH 2/2] HBASE-27712 Remove unused params in region metrics --- .../org/apache/hadoop/hbase/regionserver/MetricsRegion.java | 2 +- .../org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java index ab934fecc9e4..e8e64b634c49 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java @@ -54,7 +54,7 @@ public void updateGet() { source.updateGet(); } - public void updateScanCount() { + public void updateScan() { source.updateScan(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index 5de294e1410f..57efe505c126 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -3467,7 +3467,7 @@ private void scan(HBaseRpcController controller, ScanRequest request, RegionScan responseCellSize = rpcCall.getResponseCellSize(); blockBytesScanned = rpcCall.getBlockBytesScanned(); } - region.getMetrics().updateScanCount(); + region.getMetrics().updateScan(); final MetricsRegionServer metricsRegionServer = server.getMetrics(); if (metricsRegionServer != null) { metricsRegionServer.updateScan(region, end - before, responseCellSize, blockBytesScanned);