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-12614 Potentially unclosed StoreFile(s) in DefaultCompactor#compact()
Date Wed, 03 Dec 2014 03:33:21 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 23382fe62 -> b189b25ab


HBASE-12614 Potentially unclosed StoreFile(s) in DefaultCompactor#compact()


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b189b25a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b189b25a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b189b25a

Branch: refs/heads/branch-1
Commit: b189b25ab3896b47b82cfcaf61eebde6ba2f34b7
Parents: 23382fe
Author: tedyu <yuzhihong@gmail.com>
Authored: Tue Dec 2 19:33:08 2014 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Tue Dec 2 19:33:08 2014 -0800

----------------------------------------------------------------------
 .../hbase/regionserver/compactions/DefaultCompactor.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b189b25a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java
index df76073..baf9521 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.java
@@ -24,6 +24,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
@@ -38,6 +40,8 @@ import org.apache.hadoop.hbase.regionserver.StoreFileScanner;
  */
 @InterfaceAudience.Private
 public class DefaultCompactor extends Compactor {
+  private static final Log LOG = LogFactory.getLog(DefaultCompactor.class);
+
   public DefaultCompactor(final Configuration conf, final Store store) {
     super(conf, store);
   }
@@ -127,7 +131,11 @@ public class DefaultCompactor extends Compactor {
         }
       } finally {
         for (StoreFile f : readersToClose) {
-          f.closeReader(true);
+          try {
+            f.closeReader(true);
+          } catch (IOException ioe) {
+            LOG.warn("Exception closing " + f, ioe);
+          }
         }
       }
     }


Mime
View raw message