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 2018/08/27 16:36:52 UTC

hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

Repository: hbase
Updated Branches:
  refs/heads/master 993e74b74 -> 9e2732edb


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/9e2732ed
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9e2732ed
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9e2732ed

Branch: refs/heads/master
Commit: 9e2732edbbc1e207392bb5e3493dcf1b42a2dbcf
Parents: 993e74b
Author: tedyu <yu...@gmail.com>
Authored: Mon Aug 27 09:36:44 2018 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Mon Aug 27 09:36:44 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/9e2732ed/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 1ff9043..a040184 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
@@ -1712,6 +1712,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
+          }
+        }
+      }
     }
   }