Repository: hbase Updated Branches: refs/heads/branch-1.4 d8a2c1684 -> 21152acbe
HBASE-19979 ReplicationSyncUp tool may leak Zookeeper connection (Pankaj Kumar) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/21152acb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/21152acb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/21152acb Branch: refs/heads/branch-1.4 Commit: 21152acbe939505a1acdd521a86b8c221681b603 Parents: d8a2c16 Author: tedyu <yuzhih...@gmail.com> Authored: Tue Feb 13 08:13:48 2018 -0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Tue Feb 13 08:13:48 2018 -0800 ---------------------------------------------------------------------- .../hbase/replication/regionserver/ReplicationSyncUp.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/21152acb/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.java ---------------------------------------------------------------------- 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 e67ca5b..481302f 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 @@ -110,14 +110,14 @@ public class ReplicationSyncUp extends Configured implements Tool { Thread.sleep(SLEEP_TIME); numberOfOldSource = manager.getOldSources().size(); } + manager.join(); } catch (InterruptedException e) { System.err.println("didn't wait long enough:" + e); return (-1); + } finally { + zkw.close(); } - manager.join(); - zkw.close(); - return (0); }
