From 7da90a1e23e6421e2370638b7f2f6f7dab33b984 Mon Sep 17 00:00:00 2001
From: Michael Stack <saintstack@users.noreply.github.com>
Date: Mon, 30 Nov 2020 21:02:45 -0800
Subject: [PATCH] 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 <huaxiangsun@apache.com>
---
 .../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 05b89f87f1b..87d073c81c9 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
@@ -3790,6 +3790,9 @@ public class HRegionServer extends Thread 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.