[hbase] branch branch-2 updated: HBASE-25992 Addendum add missing catch WALEntryFilterRetryableException back

[zhangduo]

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

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


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 12d707c  HBASE-25992 Addendum add missing catch 
WALEntryFilterRetryableException back
12d707c is described below

commit 12d707c880cf11c1b7b3141df4eaba1271907753
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Mon Jun 21 23:57:37 2021 +0800

    HBASE-25992 Addendum add missing catch WALEntryFilterRetryableException back
---
 .../hbase/replication/regionserver/ReplicationSourceWALReader.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
index 6f28566..ca41184 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
@@ -155,11 +155,11 @@ class ReplicationSourceWALReader extends Thread {
           entryBatchQueue.put(batch);
           sleepMultiplier = 1;
         }
-      } catch (IOException e) { // stream related
+      } catch (WALEntryFilterRetryableException | IOException e) { // stream 
related
         if (!handleEofException(e, batch)) {
           LOG.warn("Failed to read stream of replication entries", e);
           if (sleepMultiplier < maxRetriesMultiplier) {
-            sleepMultiplier ++;
+            sleepMultiplier++;
           }
           Threads.sleep(sleepForRetries * sleepMultiplier);
         }