hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-13437 ThriftServer leaks ZooKeeper connections (Winger Pun)
Date Wed, 22 Apr 2015 14:42:58 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 385b5fa1f -> 71b775558


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/71b77555
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/71b77555
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/71b77555

Branch: refs/heads/branch-1
Commit: 71b77555848445f0c6e8b26f4ea512302d41e469
Parents: 385b5fa
Author: tedyu <yuzhihong@gmail.com>
Authored: Wed Apr 22 07:42:44 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Wed Apr 22 07:42:44 2015 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/util/ConnectionCache.java      |  1 +
 .../hadoop/hbase/util/TestConnectionCache.java  | 54 ++++++++++++++++++++
 2 files changed, 55 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/71b77555/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 976275c..4ca8486 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
@@ -220,6 +220,7 @@ public class ConnectionCache {
       if (EnvironmentEdgeManager.currentTime() > timeoutTime) {
         connections.remove(userName);
         closed = true;
+        return true;
       }
       return false;
     }

http://git-wip-us.apache.org/repos/asf/hbase/blob/71b77555/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..99b82f2
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestConnectionCache.java
@@ -0,0 +1,54 @@
+/*
+ *
+ * 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.testclassification.MiscTests;
+import org.apache.hadoop.hbase.security.UserProvider;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category({MiscTests.class, 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();
+  }
+
+}
+


Mime
View raw message