[hbase] branch branch-2.1 updated: HBASE-22047 LeaseException in Scan should be retried Signed-off-by: stack

[stack]

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

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


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new a31347f  HBASE-22047 LeaseException in Scan should be retried 
Signed-off-by: stack <st...@apache.org>
a31347f is described below

commit a31347fcccb27b2163d9f42133e818fa68c920ba
Author: Igor Rudenko <iostrea...@gmail.com>
AuthorDate: Tue Apr 23 06:26:33 2019 -0700

    HBASE-22047 LeaseException in Scan should be retried
    Signed-off-by: stack <st...@apache.org>
---
 .../src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
index 3dbe5f4..85d26ff 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
@@ -38,6 +38,7 @@ import 
org.apache.hadoop.hbase.exceptions.ScannerResetException;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
+import org.apache.hadoop.hbase.regionserver.LeaseException;
 import org.apache.hadoop.hbase.NotServingRegionException;
 import org.apache.hadoop.hbase.regionserver.RegionServerStoppedException;
 import org.apache.hadoop.hbase.TableName;
@@ -366,7 +367,7 @@ public abstract class ClientScanner extends 
AbstractClientScanner {
     if ((cause != null && cause instanceof NotServingRegionException) ||
         (cause != null && cause instanceof RegionServerStoppedException) ||
         e instanceof OutOfOrderScannerNextException || e instanceof 
UnknownScannerException ||
-        e instanceof ScannerResetException) {
+        e instanceof ScannerResetException || e instanceof LeaseException) {
       // Pass. It is easier writing the if loop test as list of what is 
allowed rather than
       // as a list of what is not allowed... so if in here, it means we do not 
throw.
       if (retriesLeft <= 0) {