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

shahrs87 · Apache9 · commit c8bb62323ea3 · 2019-08-21T21:56:37.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
@@ -511,6 +511,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
`@@ -511,6 +511,10 @@ private void initialize() {`
`511`	`511`	`}`
`512`	`512`	`}`
`513`	`513`
	`514`	`+ if (!this.isSourceActive()) {`
	`515`	`+ return;`
	`516`	`+ }`
	`517`	`+`
`514`	`518`	`// In rare case, zookeeper setting may be messed up. That leads to the incorrect`
`515`	`519`	`// peerClusterId value, which is the same as the source clusterId`
`516`	`520`	`if (clusterId.equals(peerClusterId) && !replicationEndpoint.canReplicateToSameCluster()) {`