Changeset 5269

Timestamp:

2011-12-15 14:10:26 (17 months ago)

Author:

bruno

Message:

Fix leaking HBase/ZooKeeper connections in LilyClient? related to the hbase-based blob store.

Since this would create a new Configuration object each time, HBase would not recognize it is the same, thus leading to two extra connections per server (and growing after reconnect). Besides this, the BlobManager? can probably be shared among all the Repositories, left a comment in that regard.

Location:

trunk

Files:

• cr/process/client/src/main/java/org/lilyproject/client/LilyClient.java (modified) (3 diffs)
• global/hbase-util/src/main/java/org/lilyproject/util/hbase/HBaseAdminFactory.java (modified) (2 diffs)

trunk/cr/process/client/src/main/java/org/lilyproject/client/LilyClient.java

@@ -37 +37 @@
 import org.lilyproject.repository.avro.AvroConverter;
 import org.lilyproject.repository.impl.*;
+import org.lilyproject.util.hbase.HBaseAdminFactory;
 import org.lilyproject.util.hbase.HBaseTableFactory;
 import org.lilyproject.util.hbase.HBaseTableFactoryImpl;
@@ -156 +157 @@
         RemoteTypeManager typeManager = new RemoteTypeManager(parseAddressAndPort(server.lilyAddressAndPort),
                 remoteConverter, idGenerator, zk, schemaCache);
-        
+
+        // TODO BlobManager can probably be shared across all repositories
         BlobManager blobManager = getBlobManager(zk);
         
@@ -169 +171 @@
     public static BlobManager getBlobManager(ZooKeeperItf zk) throws IOException {
         Configuration configuration = getBlobHBaseConfiguration(zk);
+        // Avoid HBase(Admin)/ZooKeeper connection leaks when using new Configuration objects each time.
+        configuration = HBaseAdminFactory.getExisting(configuration);
         HBaseTableFactory hbaseTableFactory = new HBaseTableFactoryImpl(configuration);
-        
+
         URI dfsUri = getDfsUri(zk);
         FileSystem fs = FileSystem.get(DfsUri.getBaseDfsUri(dfsUri), configuration);

trunk/global/hbase-util/src/main/java/org/lilyproject/util/hbase/HBaseAdminFactory.java

@@ -10 +10 @@
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
@@ -44 +45 @@
         admins.clear();
     }
+
+    /**
+     * If there is an existing configuration which has all the same properties as this configuration, return it.
+     * Otherwise, returns the passed conf. This is an expensive method.
+     */
+    public static Configuration getExisting(Configuration conf) {
+        Configuration[] confs;
+        synchronized (HBaseAdminFactory.class) {
+            confs = admins.keySet().toArray(new Configuration[0]);
+        }
+        
+        Map<String, String> confAsMap = toMap(conf);
+        
+        for (Configuration current : confs) {
+            if (toMap(current).equals(confAsMap)) {
+                return current;
+            }
+        }
+        
+        return conf;
+    }
+    
+    private static Map<String, String> toMap(Configuration conf) {
+        Map<String, String> result = new HashMap<String, String>();
+        Iterator<Map.Entry<String, String>> it = conf.iterator();
+        while (it.hasNext()) {
+            Map.Entry<String, String> entry = it.next();
+            result.put(entry.getKey(), entry.getValue());
+        }
+        return result;
+    }
 }