[hbase] branch master updated: HBASE-22047 LeaseException in Scan should be retried

[stack]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 375ac55  HBASE-22047 LeaseException in Scan should be retried
     new da286b9  Merge pull request #158 from hextriclosan/HBASE-22047
375ac55 is described below

commit 375ac55d777b7fc68d44401691dbefe05a3ab488
Author: Igor Rudenko <iostrea...@gmail.com>
AuthorDate: Tue Apr 16 20:03:29 2019 +0300

    HBASE-22047 LeaseException in Scan should be retried
---
 .../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 cae98aa..0342537 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.client.ScannerCallable.MoreResults;
 import org.apache.hadoop.hbase.exceptions.OutOfOrderScannerNextException;
 import org.apache.hadoop.hbase.exceptions.ScannerResetException;
 import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
+import org.apache.hadoop.hbase.regionserver.LeaseException;
 import org.apache.hadoop.hbase.regionserver.RegionServerStoppedException;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.yetus.audience.InterfaceAudience;
@@ -336,7 +337,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) {