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 2013/05/07 22:51:56 UTC
svn commit: r1480070 - in /hbase/branches/0.94/src:
main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
test/java/org/apache/hadoop/hbase/client/TestHCM.java
Author: stack
Date: Tue May 7 20:51:56 2013
New Revision: 1480070
URL: http://svn.apache.org/r1480070
Log:
HBASE-8483 HConnectionManager can leak ZooKeeper connections when using deleteStaleConnection
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1480070&r1=1480069&r2=1480070&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Tue May 7 20:51:56 2013
@@ -1392,6 +1392,9 @@ public class HConnectionManager {
throws ZooKeeperConnectionException {
if(zooKeeper == null) {
try {
+ if (this.closed) {
+ throw new IOException(toString() + " closed");
+ }
this.zooKeeper = new ZooKeeperWatcher(conf, "hconnection", this);
} catch(ZooKeeperConnectionException zce) {
throw zce;
@@ -1813,13 +1816,15 @@ public class HConnectionManager {
this.rpcEngine.close();
}
- if (this.zooKeeper != null) {
- LOG.info("Closed zookeeper sessionid=0x" +
- Long.toHexString(this.zooKeeper.getRecoverableZooKeeper().getSessionId()));
- this.zooKeeper.close();
- this.zooKeeper = null;
+ synchronized (this) {
+ if (this.zooKeeper != null) {
+ LOG.info("Closed zookeeper sessionid=0x" +
+ Long.toHexString(this.zooKeeper.getRecoverableZooKeeper().getSessionId()));
+ this.zooKeeper.close();
+ this.zooKeeper = null;
+ }
+ this.closed = true;
}
- this.closed = true;
}
public void close() {
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java?rev=1480070&r1=1480069&r2=1480070&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java Tue May 7 20:51:56 2013
@@ -23,7 +23,9 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -46,6 +48,7 @@ import org.apache.hadoop.hbase.client.HC
import org.apache.hadoop.hbase.client.HConnectionManager.HConnectionKey;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
+import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -61,6 +64,7 @@ public class TestHCM {
private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static final byte[] TABLE_NAME = Bytes.toBytes("test");
private static final byte[] TABLE_NAME1 = Bytes.toBytes("test1");
+ private static final byte[] TABLE_NAME2 = Bytes.toBytes("test2");
private static final byte[] FAM_NAM = Bytes.toBytes("f");
private static final byte[] ROW = Bytes.toBytes("bbb");
@@ -326,6 +330,64 @@ public class TestHCM {
assertTrue(c2 != c3);
}
+ /**
+ * Tests that a closed connection does not have a live zookeeper
+ * @throws Exception
+ */
+ @Test
+ public void testDeleteForZKConnLeak() throws Exception {
+ TEST_UTIL.createTable(TABLE_NAME2, FAM_NAM);
+ final Configuration config = TEST_UTIL.getConfiguration();
+
+ ThreadPoolExecutor pool = new ThreadPoolExecutor(1, 10,
+ 5, TimeUnit.SECONDS,
+ new SynchronousQueue<Runnable>(),
+ Threads.newDaemonThreadFactory("test-hcm-delete"));
+
+ pool.submit(new Runnable() {
+ @Override
+ public void run() {
+ while (!Thread.interrupted()) {
+ try {
+ HConnection conn = HConnectionManager.getConnection(config);
+ HConnectionManager.deleteStaleConnection(conn);
+ } catch (Exception e) {
+ }
+ }
+ }
+ });
+
+ // use connection multiple times
+ for (int i = 0; i < 10; i++) {
+ HConnection c1 = null;
+ try {
+ c1 = HConnectionManager.getConnection(config);
+ HTable table = new HTable(TABLE_NAME2, c1, pool);
+ table.close();
+ } catch (Exception e) {
+ } finally {
+ if (c1 != null) {
+ if (c1.isClosed()) {
+ // cannot use getZooKeeper as method instantiates watcher if null
+ Field zkwField = c1.getClass().getDeclaredField("zooKeeper");
+ zkwField.setAccessible(true);
+ Object watcher = zkwField.get(c1);
+
+ if (watcher != null) {
+ if (((ZooKeeperWatcher)watcher).getRecoverableZooKeeper().getState().isAlive()) {
+ pool.shutdownNow();
+ fail("Live zookeeper in closed connection");
+ }
+ }
+ }
+ c1.close();
+ }
+ }
+ }
+
+ pool.shutdownNow();
+ }
+
@org.junit.Rule
public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();