[1/3] hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences

[apurtell]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 dbb634ad1 -> d07cab18a
  refs/heads/branch-1.3 bc429d89c -> 36ef36ccc
  refs/heads/branch-1.4 15f17302e -> d0b0df020


HBASE-21088 HStoreFile should be closed in HStore#hasReferences

Conflicts:
        
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java


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

Branch: refs/heads/branch-1.3
Commit: 36ef36ccc5babbf1e398097855ded3e2e1b9dc34
Parents: bc429d8
Author: tedyu <yuzhih...@gmail.com>
Authored: Mon Aug 27 09:38:03 2018 -0700
Committer: Andrew Purtell <apurt...@apache.org>
Committed: Wed Sep 5 15:12:41 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/36ef36cc/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 76073d0..0f6536f 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
@@ -1605,6 +1605,17 @@ public class HStore implements Store {
       LOG.error("Error trying to determine if store has referenes, " + 
"assuming references exists",
         ioe);
       return true;
+    } finally {
+      if (reloadedStoreFiles != null) {
+        for (StoreFile storeFile : reloadedStoreFiles) {
+          try {
+            storeFile.closeReader(false);
+          } catch (IOException ioe) {
+            LOG.warn("Encountered exception closing " + storeFile + ": " + 
ioe.getMessage());
+            // continue with closing the remaining store files
+          }
+        }
+      }
     }
     return StoreUtils.hasReferences(reloadedStoreFiles);
   }