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:52:54 UTC
[hbase] branch master updated: HBASE-22601 Misconfigured addition
of peers leads to cluster shutdown. (#499)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 61a3a9f HBASE-22601 Misconfigured addition of peers leads to cluster shutdown. (#499)
61a3a9f is described below
commit 61a3a9ffbb997c2c0ca81789252d07f99e14df2e
Author: shahrs87 <sh...@gmail.com>
AuthorDate: Wed Aug 21 06:52:50 2019 -0700
HBASE-22601 Misconfigured addition of peers leads to cluster shutdown. (#499)
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 7e36d62..948c24d 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
@@ -504,6 +504,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()) {