Repository: hbase Updated Branches: refs/heads/branch-2.0 dc53d3087 -> f89b4ed9d
HBASE-21088 HStoreFile should be closed in HStore#hasReferences Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f89b4ed9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f89b4ed9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f89b4ed9 Branch: refs/heads/branch-2.0 Commit: f89b4ed9d6ff3b8a1cf83196d061d99f044f8f23 Parents: dc53d30 Author: Ted Yu <yuzhih...@gmail.com> Authored: Mon Aug 27 20:31:08 2018 -0700 Committer: Michael Stack <st...@apache.org> Committed: Mon Aug 27 20:31:08 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f89b4ed9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java index dad9346..2227e58 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java @@ -1643,6 +1643,17 @@ public class HStore implements Store, HeapSize, StoreConfigInformation, Propagat LOG.error("Error trying to determine if store has references, assuming references exists", ioe); return true; + } finally { + if (reloadedStoreFiles != null) { + for (HStoreFile storeFile : reloadedStoreFiles) { + try { + storeFile.closeStoreFile(false); + } catch (IOException ioe) { + LOG.warn("Encountered exception closing " + storeFile + ": " + ioe.getMessage()); + // continue with closing the remaining store files + } + } + } } }
