You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/02/07 23:26:45 UTC
svn commit: r1565837 - in /hbase/trunk/hbase-server/src:
main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java
Author: stack
Date: Fri Feb 7 22:26:45 2014
New Revision: 1565837
URL: http://svn.apache.org/r1565837
Log:
HBASE-10482 ReplicationSyncUp doesn't clean up its ZK, needed for tests
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java?rev=1565837&r1=1565836&r2=1565837&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java Fri Feb 7 22:26:45 2014
@@ -115,6 +115,7 @@ public class ReplicationSyncUp extends C
}
manager.join();
+ zkw.close();
return (0);
}
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java?rev=1565837&r1=1565836&r2=1565837&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java Fri Feb 7 22:26:45 2014
@@ -207,6 +207,7 @@ public class TestReplicationSyncUpTool e
}
private void putAndReplicateRows() throws Exception {
+ LOG.debug("putAndReplicateRows");
// add rows to Master cluster,
Put p;
@@ -260,6 +261,7 @@ public class TestReplicationSyncUpTool e
}
private void mimicSyncUpAfterDelete() throws Exception {
+ LOG.debug("mimicSyncUpAfterDelete");
utility2.shutdownMiniHBaseCluster();
List<Delete> list = new ArrayList<Delete>();
@@ -329,6 +331,7 @@ public class TestReplicationSyncUpTool e
}
private void mimicSyncUpAfterPut() throws Exception {
+ LOG.debug("mimicSyncUpAfterPut");
utility1.restartHBaseCluster(1);
utility2.shutdownMiniHBaseCluster();