From 4f45d96ab152991f3a26370950ad9b3e26f024b3 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Tue, 21 May 2013 20:02:50 +0000 Subject: [PATCH] HBASE-8586 Revisit of hbase-8483, "HConnectionManager can leak ZooKeeper connections when using deleteStaleConnection" git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1484925 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/org/apache/hadoop/hbase/client/TestHCM.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java index a3ef681513a..d0819f1a9fd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java @@ -817,7 +817,7 @@ public class TestHCM { config.setInt("zookeeper.recovery.retry", 1); config.setInt("zookeeper.recovery.retry.intervalmill", 1000); config.setInt("hbase.rpc.timeout", 2000); - config.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2); + config.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 1); ThreadPoolExecutor pool = new ThreadPoolExecutor(1, 10, 5, TimeUnit.SECONDS, @@ -866,7 +866,7 @@ public class TestHCM { if (((ZooKeeperWatcher)watcher).getRecoverableZooKeeper().getState().isAlive()) { // non-synchronized access to watcher; sleep and check again in case zk connection // hasn't been cleaned up yet. - Thread.sleep(50); + Thread.sleep(1000); if (((ZooKeeperWatcher) watcher).getRecoverableZooKeeper().getState().isAlive()) { pool.shutdownNow(); fail("Live zookeeper in closed connection");