From c15ef80856459ef1ddae178bca954051de7fd07b Mon Sep 17 00:00:00 2001 From: Phil Yang Date: Mon, 13 Feb 2017 19:03:27 +0800 Subject: [PATCH] Do not stop server if ReplicationSourceManager's waitUntilCanBePushed throws InterruptedException --- .../hadoop/hbase/replication/regionserver/ReplicationSource.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java index 5ef573a..d3f6d35 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java @@ -615,9 +615,12 @@ public class ReplicationSource extends Thread implements ReplicationSourceInterf if (!canSkipWaitingSet.getUnchecked(key)) { try { manager.waitUntilCanBePushed(Bytes.toBytes(key), seq, actualPeerId); - } catch (Exception e) { + } catch (IOException e) { LOG.error("waitUntilCanBePushed fail", e); stopper.stop("waitUntilCanBePushed fail"); + } catch (InterruptedException e) { + LOG.warn("waitUntilCanBePushed interrupted", e); + Thread.currentThread().interrupt(); } canSkipWaitingSet.put(key, true); } -- 2.10.1 (Apple Git-78)