From 653e682d99f8ea73a9bd615e8d4cbb88d0faa3b0 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 7 Feb 2014 22:26:45 +0000
Subject: [PATCH] HBASE-10482 ReplicationSyncUp doesn't clean up its ZK, needed
 for tests

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1565837 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hbase/replication/regionserver/ReplicationSyncUp.java      | 1 +
 .../hadoop/hbase/replication/TestReplicationSyncUpTool.java    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
index 52b27738492..59b7f0776b7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
@@ -115,6 +115,7 @@ public class ReplicationSyncUp extends Configured implements Tool {
     }
 
     manager.join();
+    zkw.close();
 
     return (0);
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java
index 817111a356f..e8620d47543 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java
@@ -207,6 +207,7 @@ public class TestReplicationSyncUpTool extends TestReplicationBase {
   }
 
   private void putAndReplicateRows() throws Exception {
+    LOG.debug("putAndReplicateRows");
     // add rows to Master cluster,
     Put p;
 
@@ -260,6 +261,7 @@ public class TestReplicationSyncUpTool extends TestReplicationBase {
   }
 
   private void mimicSyncUpAfterDelete() throws Exception {
+    LOG.debug("mimicSyncUpAfterDelete");
     utility2.shutdownMiniHBaseCluster();
 
     List<Delete> list = new ArrayList<Delete>();
@@ -329,6 +331,7 @@ public class TestReplicationSyncUpTool extends TestReplicationBase {
   }
 
   private void mimicSyncUpAfterPut() throws Exception {
+    LOG.debug("mimicSyncUpAfterPut");
     utility1.restartHBaseCluster(1);
     utility2.shutdownMiniHBaseCluster();