You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/03/31 23:32:15 UTC

[5/5] hbase git commit: HBASE-17698 ReplicationEndpoint choosing sinks

HBASE-17698 ReplicationEndpoint choosing sinks

Signed-off-by: Andrew Purtell <ap...@apache.org>


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

Branch: refs/heads/branch-1.1
Commit: 575a8c909be5a3e032a8fc757f7224b234ce7307
Parents: 1fdb97c
Author: Karan Mehta <k....@kmehta-ltm1.internal.salesforce.com>
Authored: Mon Mar 6 15:56:24 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Mar 31 16:31:42 2017 -0700

----------------------------------------------------------------------
 .../regionserver/HBaseInterClusterReplicationEndpoint.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/575a8c90/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
index d36a1e8..188fa92 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
@@ -178,8 +178,8 @@ public class HBaseInterClusterReplicationEndpoint extends HBaseReplicationEndpoi
                 + "Replication cannot proceed without losing data.", sleepMultiplier)) {
               sleepMultiplier++;
             }
-          } else if (ioe instanceof SaslException) {
-            LOG.warn("Peer encountered SaslException, rechecking all sinks: ", ioe);
+          } else {
+            LOG.warn("Peer encountered RemoteException, rechecking all sinks: ", ioe);
             replicationSinkMgr.chooseSinks();
           }
         } else {