[hbase] branch branch-2.2 updated: HBASE-25345 [Flakey Tests] branch-2 TestReadReplicas#testVerifySecondaryAbilityToReadWithOnFiles (#2727)

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new 5b49f36  HBASE-25345 [Flakey Tests] branch-2 TestReadReplicas#testVerifySecondaryAbilityToReadWithOnFiles (#2727)
5b49f36 is described below

commit 5b49f36bdfe3555dfb167192b45b3917106eed42
Author: Michael Stack <sa...@users.noreply.github.com>
AuthorDate: Mon Nov 30 21:02:45 2020 -0800

    HBASE-25345 [Flakey Tests] branch-2 TestReadReplicas#testVerifySecondaryAbilityToReadWithOnFiles (#2727)
    
    Check TEST_SKIP_REPORTING_TRANSITION and if true, skip trying to talk to
    update master on state transition -- i.e. reportFileArchivalForQuotas --
    as we allow for reportRegionStateTransition (For tests only)
    
    Signed-off-by: Huaxiang Sun <hu...@apache.com>
---
 .../main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 599a111..32830b1 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -3733,6 +3733,9 @@ public class HRegionServer extends HasThread implements
   @Override
   public boolean reportFileArchivalForQuotas(TableName tableName,
       Collection<Entry<String, Long>> archivedFiles) {
+    if (TEST_SKIP_REPORTING_TRANSITION) {
+      return false;
+    }
     RegionServerStatusService.BlockingInterface rss = rssStub;
     if (rss == null || rsSpaceQuotaManager == null) {
       // the current server could be stopping.