Repository: hbase Updated Branches: refs/heads/0.98 602884b84 -> ba02635a4
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/ba02635a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ba02635a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ba02635a Branch: refs/heads/0.98 Commit: ba02635a47fda86ae88cbc32c2ec5e3a0defe1fc Parents: 602884b Author: stack <st...@apache.org> Authored: Wed Oct 21 21:57:31 2015 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Fri Oct 23 11:50:03 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/ba02635a/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 da83e4b..ae516e5 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 @@ -745,7 +745,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; } });
