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 2014/12/03 04:31:26 UTC
hbase git commit: HBASE-12614 Potentially unclosed StoreFile(s) in
DefaultCompactor#compact()
Repository: hbase
Updated Branches:
refs/heads/master 54f438cee -> a8a134374
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/a8a13437
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a8a13437
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a8a13437
Branch: refs/heads/master
Commit: a8a134374e1c2c81b547a227c3678bae10e0ddbe
Parents: 54f438c
Author: tedyu <yu...@gmail.com>
Authored: Tue Dec 2 19:31:21 2014 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Dec 2 19:31:21 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/a8a13437/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);
+ }
}
}
}