[hbase] branch branch-2 updated: HBASE-25967 The readRequestsCount does not calculate when the outResu… (#3351)

[wangzheng]

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 88f031e  HBASE-25967 The readRequestsCount does not calculate when the 
outResu… (#3351)
88f031e is described below

commit 88f031eeec4605365d96719f4b0813fbfb355de8
Author: bsglz <18031...@qq.com>
AuthorDate: Thu Jun 10 09:37:31 2021 +0800

    HBASE-25967 The readRequestsCount does not calculate when the outResu… 
(#3351)
    
    * HBASE-25967 The readRequestsCount does not calculate when the outResults 
is empty
    
    Co-authored-by: Zheng Wang <wangzh...@apache.org>
    (cherry picked from commit 329f0baa98c8b938ebd926e5bf8cfa69fd2f2a74)
---
 .../org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java   | 8 +++-----
 .../hbase/master/assignment/TestTransitRegionStateProcedure.java  | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java
index a59f643..612bb5c 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScannerImpl.java
@@ -269,11 +269,9 @@ class RegionScannerImpl implements RegionScanner, Shipper, 
RpcCallback {
       outResults.addAll(tmpList);
     }
 
-    if (!outResults.isEmpty()) {
-      region.addReadRequestsCount(1);
-      if (region.getMetrics() != null) {
-        region.getMetrics().updateReadRequestCount();
-      }
+    region.addReadRequestsCount(1);
+    if (region.getMetrics() != null) {
+      region.getMetrics().updateReadRequestCount();
     }
 
     // If the size limit was reached it means a partial Result is being 
returned. Returning a
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestTransitRegionStateProcedure.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestTransitRegionStateProcedure.java
index c55a9f9..4770690 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestTransitRegionStateProcedure.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestTransitRegionStateProcedure.java
@@ -142,7 +142,9 @@ public class TestTransitRegionStateProcedure {
     long openSeqNum2 = region2.getOpenSeqNum();
     // confirm that the region is successfully opened
     assertTrue(openSeqNum2 > openSeqNum);
-    assertEquals(1, region2.getReadRequestsCount());
+    // we check the available by scan after table created,
+    // so the readRequestsCount should be 2 here
+    assertEquals(2, region2.getReadRequestsCount());
     assertEquals(2, region2.getWriteRequestsCount());
   }