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 2018/02/13 16:45:20 UTC
hbase git commit: HBASE-19979 ReplicationSyncUp tool may leak
Zookeeper connection
Repository: hbase
Updated Branches:
refs/heads/branch-2 41f1e5c79 -> 4594f7156
HBASE-19979 ReplicationSyncUp tool may leak Zookeeper connection
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4594f715
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4594f715
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4594f715
Branch: refs/heads/branch-2
Commit: 4594f7156d98ce4f30c198472830443ee0588275
Parents: 41f1e5c
Author: Pankaj Kumar <pa...@huawei.com>
Authored: Tue Feb 13 08:43:43 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Feb 13 08:43:52 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/4594f715/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 a5cd9b2..43c7bce 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
@@ -114,14 +114,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);
}