hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yangzhe1...@apache.org
Subject hbase git commit: HBASE-17639 Do not stop server if ReplicationSourceManager's waitUntilCanBePushed throws InterruptedException
Date Tue, 14 Feb 2017 10:00:04 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 d7c304573 -> 0a25bf5b3


HBASE-17639 Do not stop server if ReplicationSourceManager's waitUntilCanBePushed throws InterruptedException


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0a25bf5b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0a25bf5b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0a25bf5b

Branch: refs/heads/branch-1
Commit: 0a25bf5b3fe33ea2b894df06906e4ec1d75ac338
Parents: d7c3045
Author: Phil Yang <yangzhe1991@apache.org>
Authored: Mon Feb 13 19:03:27 2017 +0800
Committer: Phil Yang <yangzhe1991@apache.org>
Committed: Tue Feb 14 17:48:49 2017 +0800

----------------------------------------------------------------------
 .../hbase/replication/regionserver/ReplicationSource.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/0a25bf5b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
----------------------------------------------------------------------
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 8013a5a..ce070d0 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
@@ -762,9 +762,12 @@ public class ReplicationSource extends Thread
       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);
       }


Mime
View raw message