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/02/22 02:50:31 UTC

[1/5] hbase git commit: HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

Repository: hbase
Updated Branches:
  refs/heads/branch-1 cdb38830d -> 27a8aa99d
  refs/heads/branch-1.1 daf2dc9a8 -> 7a196b7fb
  refs/heads/branch-1.2 fdb7655c6 -> 3c7e96a6f
  refs/heads/branch-1.3 44d9bbe22 -> 00d79eb9f
  refs/heads/master d7ffa0013 -> 3c0750de5


HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

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/3c0750de
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3c0750de
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3c0750de

Branch: refs/heads/master
Commit: 3c0750de54276cf19a35feb6351c71b8dea360b7
Parents: d7ffa00
Author: rgidwani <rg...@salesforce.com>
Authored: Tue Feb 21 15:17:21 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 21 18:44:54 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/3c0750de/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 3ab8885..de3159f 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
@@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.FSUtils;
 import org.apache.hadoop.hbase.wal.WAL.Entry;
 import org.apache.hadoop.ipc.RemoteException;
+import javax.security.sasl.SaslException;
 
 /**
  * A {@link org.apache.hadoop.hbase.replication.ReplicationEndpoint}
@@ -293,6 +294,9 @@ 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);
+            replicationSinkMgr.chooseSinks();
           }
         } else {
           if (ioe instanceof SocketTimeoutException) {


[3/5] hbase git commit: HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

Posted by ap...@apache.org.
HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

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/00d79eb9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/00d79eb9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/00d79eb9

Branch: refs/heads/branch-1.3
Commit: 00d79eb9fbc34b36b2c85a6d834106c8b69525c9
Parents: 44d9bbe
Author: rgidwani <rg...@salesforce.com>
Authored: Tue Feb 21 15:17:21 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 21 18:45:21 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/00d79eb9/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 548f716..be4fc7b 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
@@ -54,6 +54,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.FSUtils;
 import org.apache.hadoop.hbase.wal.WAL.Entry;
 import org.apache.hadoop.ipc.RemoteException;
+import javax.security.sasl.SaslException;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -293,6 +294,9 @@ 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);
+            replicationSinkMgr.chooseSinks();
           }
         } else {
           if (ioe instanceof SocketTimeoutException) {


[2/5] hbase git commit: HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

Posted by ap...@apache.org.
HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

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/27a8aa99
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/27a8aa99
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/27a8aa99

Branch: refs/heads/branch-1
Commit: 27a8aa99d913899752cbbf48bb4b639d299fca83
Parents: cdb3883
Author: rgidwani <rg...@salesforce.com>
Authored: Tue Feb 21 15:17:21 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 21 18:45:15 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/27a8aa99/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 548f716..be4fc7b 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
@@ -54,6 +54,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.FSUtils;
 import org.apache.hadoop.hbase.wal.WAL.Entry;
 import org.apache.hadoop.ipc.RemoteException;
+import javax.security.sasl.SaslException;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -293,6 +294,9 @@ 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);
+            replicationSinkMgr.chooseSinks();
           }
         } else {
           if (ioe instanceof SocketTimeoutException) {


[5/5] hbase git commit: HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

Posted by ap...@apache.org.
HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

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/7a196b7f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7a196b7f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7a196b7f

Branch: refs/heads/branch-1.1
Commit: 7a196b7fb89bcf5bb83a8110e78575ab18a53012
Parents: daf2dc9
Author: rgidwani <rg...@salesforce.com>
Authored: Tue Feb 21 15:17:21 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 21 18:45:29 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/7a196b7f/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 735ad55..d36a1e8 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
@@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.replication.HBaseReplicationEndpoint;
 import org.apache.hadoop.hbase.replication.ReplicationPeer.PeerState;
 import org.apache.hadoop.hbase.replication.regionserver.ReplicationSinkManager.SinkPeer;
 import org.apache.hadoop.ipc.RemoteException;
+import javax.security.sasl.SaslException;
 
 /**
  * A {@link org.apache.hadoop.hbase.replication.ReplicationEndpoint} 
@@ -177,6 +178,9 @@ 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);
+            replicationSinkMgr.chooseSinks();
           }
         } else {
           if (ioe instanceof SocketTimeoutException) {


[4/5] hbase git commit: HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

Posted by ap...@apache.org.
HBASE-17675 ReplicationEndpoint should choose new sinks if a SaslException occurs

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/3c7e96a6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3c7e96a6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3c7e96a6

Branch: refs/heads/branch-1.2
Commit: 3c7e96a6fde2fad85483631032c7526a96e49f22
Parents: fdb7655
Author: rgidwani <rg...@salesforce.com>
Authored: Tue Feb 21 15:17:21 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Feb 21 18:45:26 2017 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/3c7e96a6/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 9300d4b..8176384 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
@@ -52,6 +52,7 @@ import org.apache.hadoop.hbase.replication.HBaseReplicationEndpoint;
 import org.apache.hadoop.hbase.replication.ReplicationPeer.PeerState;
 import org.apache.hadoop.hbase.replication.regionserver.ReplicationSinkManager.SinkPeer;
 import org.apache.hadoop.ipc.RemoteException;
+import javax.security.sasl.SaslException;
 
 /**
  * A {@link org.apache.hadoop.hbase.replication.ReplicationEndpoint} 
@@ -263,6 +264,9 @@ 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);
+            replicationSinkMgr.chooseSinks();
           }
         } else {
           if (ioe instanceof SocketTimeoutException) {