svn commit: r1587966 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util: HBaseFsck.java HMerge.java

[tedyu]

Author: tedyu
Date: Wed Apr 16 16:35:56 2014
New Revision: 1587966

URL: http://svn.apache.org/r1587966
Log:
HBASE-10995 Fix resource leak related to unclosed HBaseAdmin


Modified:
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
    
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java?rev=1587966&r1=1587965&r2=1587966&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
 (original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
 Wed Apr 16 16:35:56 2014
@@ -2722,11 +2722,21 @@ public class HBaseFsck extends Configure
 
   HTableDescriptor[] getHTableDescriptors(List<TableName> tableNames) {
     HTableDescriptor[] htd = new HTableDescriptor[0];
+    HBaseAdmin admin = null;
     try {
       LOG.info("getHTableDescriptors == tableNames => " + tableNames);
-      htd = new 
HBaseAdmin(getConf()).getTableDescriptorsByTableName(tableNames);
+      admin = new HBaseAdmin(getConf());
+      htd = admin.getTableDescriptorsByTableName(tableNames);
     } catch (IOException e) {
       LOG.debug("Exception getting table descriptors", e);
+    } finally {
+      if (admin != null) {
+        try {
+          admin.close();
+        } catch (IOException e) {
+          LOG.debug("Exception closing HBaseAdmin", e);
+        }
+      }
     }
     return htd;
   }

Modified: 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java?rev=1587966&r1=1587965&r2=1587966&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java 
(original)
+++ 
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java 
Wed Apr 16 16:35:56 2014
@@ -125,8 +125,12 @@ class HMerge {
             "HBase instance must be running to merge a normal table");
       }
       HBaseAdmin admin = new HBaseAdmin(conf);
-      if (!admin.isTableDisabled(tableName)) {
-        throw new TableNotDisabledException(tableName);
+      try {
+        if (!admin.isTableDisabled(tableName)) {
+          throw new TableNotDisabledException(tableName);
+        }
+      } finally {
+        admin.close();
       }
       new OnlineMerger(conf, fs, tableName).process();
     }