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

toffer pushed a commit to branch HBASE-11288.branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit c09fb1cf51207926621d71d4ca5d5d875af7778a
Author: Francis Liu <[email protected]>
AuthorDate: Sat Aug 8 14:31:41 2020 -0700

    made reportRegionStateTransition retry delays a bit smarter
---
 .../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 64deba5..af5c487 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
@@ -2385,6 +2385,7 @@ public class HRegionServer extends Thread implements
     // Time to pause if master says 'please hold'. Make configurable if needed.
     final long initPauseTime = 1000;
     int tries = 0;
+    int pausedTries = 0;
     long pauseTime;
     // Keep looping till we get an error. We want to send reports even though 
server is going down.
     // Only go down if clusterConnection is null. It is set to null almost as 
last thing as the
@@ -2416,12 +2417,15 @@ public class HRegionServer extends Thread implements
                 || ioe instanceof CallQueueTooBigException;
         if (pause) {
           // Do backoff else we flood the Master with requests.
-          pauseTime = ConnectionUtils.getPauseTime(initPauseTime, tries);
+          pauseTime = ConnectionUtils.getPauseTime(initPauseTime, pausedTries);
+          pausedTries++;
         } else {
           pauseTime = initPauseTime; // Reset.
+          pausedTries = 0;
         }
         LOG.info("Failed report transition " +
           TextFormat.shortDebugString(request) + "; retry (#" + tries + ")" +
+            "; paused retry (#" + pausedTries + ")" +
             (pause?
                 " after " + pauseTime + "ms delay (Master is coming 
online...).":
                 " immediately."),

Reply via email to