From a1f59d8e1b96b7458c110cacc9d860d6b9573ac4 Mon Sep 17 00:00:00 2001
From: Adrian Muraru <amuraru@adobe.com>
Date: Thu, 30 Oct 2014 23:50:02 +0200
Subject: [PATCH] Replication gets stuck following a transient zookeeper error
 to remote peer cluster

Signed-off-by: Andrew Purtell <apurtell@apache.org>
---
 .../replication/regionserver/ReplicationSinkManager.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 2104268f299..b186e089778 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();
     }