[hbase] branch branch-2.3 updated: HBASE-25967 The readRequestsCount does not calculate when the outResults is empty

[wangzheng]

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 dfd65f1  HBASE-25967 The readRequestsCount does not calculate when the 
outResults is empty
dfd65f1 is described below

commit dfd65f1deffaed28b7ac340a88370e51ce76f0a2
Author: Zheng Wang <wangzh...@apache.org>
AuthorDate: Thu Jun 10 11:08:30 2021 +0800

    HBASE-25967 The readRequestsCount does not calculate when the outResults is 
empty
    
    (cherry picked from commit 1fd584ed2f8a60e5f73c690fb30354a36799def8)
---
 .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.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/HRegion.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index fe314a0..b328fa3 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
@@ -6732,11 +6732,9 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
         outResults.addAll(tmpList);
       }
 
-      if (!outResults.isEmpty()) {
-        readRequestsCount.increment();
-        if (metricsRegion != null) {
-          metricsRegion.updateReadRequestCount();
-        }
+      readRequestsCount.increment();
+      if (metricsRegion != null) {
+        metricsRegion.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 c0b954a..16aff4d 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());
   }