Repository: hbase Updated Branches: refs/heads/0.98 d65d0cb92 -> 61b4ac99f refs/heads/branch-1 e15a803b5 -> 0505072c5 refs/heads/master b784f7db9 -> a1f59d8e1
Replication gets stuck following a transient zookeeper error to remote peer cluster Signed-off-by: Andrew Purtell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a1f59d8e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a1f59d8e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a1f59d8e Branch: refs/heads/master Commit: a1f59d8e1b96b7458c110cacc9d860d6b9573ac4 Parents: b784f7d Author: Adrian Muraru <[email protected]> Authored: Thu Oct 30 23:50:02 2014 +0200 Committer: Andrew Purtell <[email protected]> Committed: Fri Oct 31 17:59:29 2014 -0700 ---------------------------------------------------------------------- .../hbase/replication/regionserver/ReplicationSinkManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a1f59d8e/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSinkManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSinkManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSinkManager.java index 2104268..b186e08 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSinkManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSinkManager.java @@ -106,8 +106,8 @@ public class ReplicationSinkManager { * @return a replication sink to replicate to */ public SinkPeer getReplicationSink() throws IOException { - if (endpoint.getLastRegionServerUpdate() > this.lastUpdateToPeers) { - LOG.info("Current list of sinks is out of date, updating"); + if (endpoint.getLastRegionServerUpdate() > this.lastUpdateToPeers || sinks.isEmpty()) { + LOG.info("Current list of sinks is out of date or empty, updating"); chooseSinks(); }
