HBASE-22601 Misconfigured addition of peers leads to cluster shutdown. (#499)

shahrs87 · Apache9 · commit 61a3a9ffbb99 · 2019-08-21T21:52:50.000+08:00
Signed-off-by: Duo Zhang &lt;zhangduo@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
@@ -504,6 +504,10 @@ private void initialize() {
       }
     }
 
+    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
`@@ -504,6 +504,10 @@ private void initialize() {`
`504`	`504`	`}`
`505`	`505`	`}`
`506`	`506`
	`507`	`+ if(!this.isSourceActive()) {`
	`508`	`+ return;`
	`509`	`+ }`
	`510`	`+`
`507`	`511`	`// In rare case, zookeeper setting may be messed up. That leads to the incorrect`
`508`	`512`	`// peerClusterId value, which is the same as the source clusterId`
`509`	`513`	`if (clusterId.equals(peerClusterId) && !replicationEndpoint.canReplicateToSameCluster()) {`