You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2015/10/24 00:49:44 UTC

[24/50] [abbrv] hbase git commit: HBASE-14663 HStore::close does not honor config hbase.rs.evictblocksonclose (Vladimir Rodionov)

HBASE-14663 HStore::close does not honor config hbase.rs.evictblocksonclose (Vladimir Rodionov)


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

Branch: refs/heads/hbase-12439
Commit: ab677a19fc5d909890b4f74ddc3087e4699d81a1
Parents: f9df3e9
Author: stack <st...@apache.org>
Authored: Wed Oct 21 21:57:31 2015 -0700
Committer: stack <st...@apache.org>
Committed: Wed Oct 21 21:57:41 2015 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/regionserver/HStore.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/ab677a19/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 cfda1c6..2ba8dc5 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
@@ -862,7 +862,9 @@ public class HStore implements Store {
           completionService.submit(new Callable<Void>() {
             @Override
             public Void call() throws IOException {
-              f.closeReader(true);
+              boolean evictOnClose = 
+                  cacheConf != null? cacheConf.shouldEvictOnClose(): true; 
+              f.closeReader(evictOnClose);
               return null;
             }
           });