[hbase] branch branch-1 updated: [HBASE-22601] Misconfigured addition of peers leads to cluster shutdown. (#490)

[apurtell]

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

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


The following commit(s) were added to refs/heads/branch-1 by this push:
     new bb87e3a  [HBASE-22601] Misconfigured addition of peers leads to 
cluster shutdown. (#490)
bb87e3a is described below

commit bb87e3a7bf161c87e838ed4d3eb176f588383bb1
Author: shahrs87 <shahr...@gmail.com>
AuthorDate: Thu Aug 22 13:04:23 2019 -0700

    [HBASE-22601] Misconfigured addition of peers leads to cluster shutdown. 
(#490)
    
    Signed-off-by: Andrew Purtell <apurt...@apache.org>
---
 .../hadoop/hbase/replication/regionserver/ReplicationSource.java      | 4 ++++
 1 file changed, 4 insertions(+)

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 c7780bb..124da63 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
@@ -310,6 +310,10 @@ public class ReplicationSource extends Thread implements 
ReplicationSourceInterf
       }
     }
 
+    if (!this.isSourceActive()) {
+      return;
+    }
+
     // In rare case, zookeeper setting may be messed up. That leads to the 
incorrect
     // peerClusterId value, which is the same as the source clusterId
     if (clusterId.equals(peerClusterId) && 
!replicationEndpoint.canReplicateToSameCluster()) {