[HBASE-22601] Misconfigured addition of peers leads to cluster shutdown. (#490)

shahrs87 · apurtell · commit 6a0c26fff139 · 2019-08-22T13:04:23.000-07:00
Signed-off-by: Andrew Purtell &lt;apurtell@apache.org&gt;
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
@@ -309,6 +309,10 @@ public void run() {
       }
     }
 
+    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()) {

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,10 @@ public void run() {`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`
	`312`	`+ if (!this.isSourceActive()) {`
	`313`	`+ return;`
	`314`	`+ }`
	`315`	`+`
`312`	`316`	`// In rare case, zookeeper setting may be messed up. That leads to the incorrect`
`313`	`317`	`// peerClusterId value, which is the same as the source clusterId`
`314`	`318`	`if (clusterId.equals(peerClusterId) && !replicationEndpoint.canReplicateToSameCluster()) {`