You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/04/22 16:41:55 UTC
hbase git commit: HBASE-13437 ThriftServer leaks ZooKeeper
connections (Winger Pun)
Repository: hbase
Updated Branches:
refs/heads/0.98 505fc4885 -> 5e38ffe6f
HBASE-13437 ThriftServer leaks ZooKeeper connections (Winger Pun)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5e38ffe6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5e38ffe6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5e38ffe6
Branch: refs/heads/0.98
Commit: 5e38ffe6f43193e6cbb1211feff95c85d05d577c
Parents: 505fc48
Author: tedyu <yu...@gmail.com>
Authored: Wed Apr 22 07:41:43 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Apr 22 07:41:43 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/util/ConnectionCache.java | 1 +
.../hadoop/hbase/util/TestConnectionCache.java | 53 ++++++++++++++++++++
2 files changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5e38ffe6/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java
index 2363cd7..fe0bf05 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java
@@ -203,6 +203,7 @@ public class ConnectionCache {
if (EnvironmentEdgeManager.currentTimeMillis() > timeoutTime) {
connections.remove(userName);
closed = true;
+ return true;
}
return false;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/5e38ffe6/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestConnectionCache.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestConnectionCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestConnectionCache.java
new file mode 100644
index 0000000..a04fd11
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestConnectionCache.java
@@ -0,0 +1,53 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.util;
+
+import junit.framework.TestCase;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.security.UserProvider;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category({MediumTests.class})
+public class TestConnectionCache extends TestCase {
+ private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+
+ /**
+ * test for ConnectionCache cleaning expired HConnection
+ */
+ @Test
+ public void testConnectionChore() throws Exception {
+ UTIL.startMiniCluster();
+
+ //1s for clean interval & 5s for maxIdleTime
+ ConnectionCache cache = new ConnectionCache(UTIL.getConfiguration(),
+ UserProvider.instantiate(UTIL.getConfiguration()), 1000, 5000);
+ ConnectionCache.ConnectionInfo info = cache.getCurrentConnection();
+
+ assertEquals(false, info.connection.isClosed());
+
+ Thread.sleep(7000);
+
+ assertEquals(true, info.connection.isClosed());
+ UTIL.shutdownMiniCluster();
+ }
+
+}
+