[hbase] branch branch-2.2 updated: HBASE-22292 PreemptiveFastFailInterceptor clean repeatedFailuresMap issue

[stack]

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 79319ec  HBASE-22292 PreemptiveFastFailInterceptor clean 
repeatedFailuresMap issue
79319ec is described below

commit 79319ece124875865f68116d678775ad93bbaa48
Author: zouxiangwen <jxxiang...@outlook.com>
AuthorDate: Tue Apr 23 22:56:59 2019 +0800

    HBASE-22292 PreemptiveFastFailInterceptor clean repeatedFailuresMap issue
    
    Signed-off-by: stack <st...@apache.org>
---
 .../apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java  | 7 +++++--
 hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
index f6289d2..a8406a4 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
@@ -96,8 +96,11 @@ class PreemptiveFastFailInterceptor extends 
RetryingCallerInterceptor {
         HConstants.HBASE_CLIENT_FAST_FAIL_THREASHOLD_MS,
         HConstants.HBASE_CLIENT_FAST_FAIL_THREASHOLD_MS_DEFAULT);
     this.failureMapCleanupIntervalMilliSec = conf.getLong(
-        HConstants.HBASE_CLIENT_FAST_FAIL_CLEANUP_MS_DURATION_MS,
-        HConstants.HBASE_CLIENT_FAST_FAIL_CLEANUP_DURATION_MS_DEFAULT);
+            HConstants.HBASE_CLIENT_FAILURE_MAP_CLEANUP_INTERVAL_MS,
+            HConstants.HBASE_CLIENT_FAILURE_MAP_CLEANUP_INTERVAL_MS_DEFAULT);
+    this.fastFailClearingTimeMilliSec = conf.getLong(
+            HConstants.HBASE_CLIENT_FAST_FAIL_CLEANUP_MS_DURATION_MS,
+            HConstants.HBASE_CLIENT_FAST_FAIL_CLEANUP_DURATION_MS_DEFAULT);
     lastFailureMapCleanupTimeMilliSec = EnvironmentEdgeManager.currentTime();
   }
 
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 4680e6d..2f3b995 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -1349,6 +1349,12 @@ public final class HConstants {
   public static final long HBASE_CLIENT_FAST_FAIL_THREASHOLD_MS_DEFAULT =
       60000;
 
+  public static final String HBASE_CLIENT_FAILURE_MAP_CLEANUP_INTERVAL_MS =
+          "hbase.client.failure.map.cleanup.interval";
+
+  public static final long 
HBASE_CLIENT_FAILURE_MAP_CLEANUP_INTERVAL_MS_DEFAULT =
+          600000;
+
   public static final String HBASE_CLIENT_FAST_FAIL_CLEANUP_MS_DURATION_MS =
       "hbase.client.fast.fail.cleanup.duration";