You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2019/08/22 20:26:31 UTC
[hbase] branch branch-1.4 updated: [HBASE-22601] Misconfigured
addition of peers leads to cluster shutdown. (#490)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1.4 by this push:
new 5cc3bf3 [HBASE-22601] Misconfigured addition of peers leads to cluster shutdown. (#490)
5cc3bf3 is described below
commit 5cc3bf34df2d24a5566f7e8957893ac3e8fae7c7
Author: shahrs87 <sh...@gmail.com>
AuthorDate: Thu Aug 22 13:04:23 2019 -0700
[HBASE-22601] Misconfigured addition of peers leads to cluster shutdown. (#490)
Signed-off-by: Andrew Purtell <ap...@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 6ae1d1b..d29a60b 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
@@ -307,6 +307,10 @@ public class ReplicationSource extends Thread implements ReplicationSourceInterf
}
}
+ 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()) {