You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/08/21 13:57:45 UTC
[hbase] branch branch-2.1 updated: HBASE-22601 Misconfigured
addition of peers leads to cluster shutdown. (#500)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 0a8e206 HBASE-22601 Misconfigured addition of peers leads to cluster shutdown. (#500)
0a8e206 is described below
commit 0a8e2067d28c3b550b959313877a806d74af07e4
Author: shahrs87 <sh...@gmail.com>
AuthorDate: Wed Aug 21 06:56:04 2019 -0700
HBASE-22601 Misconfigured addition of peers leads to cluster shutdown. (#500)
Signed-off-by: Duo Zhang <zh...@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 b4c9ad3..573f573 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
@@ -511,6 +511,10 @@ public class ReplicationSource implements ReplicationSourceInterface {
}
}
+ 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()) {