You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2015/06/06 04:38:22 UTC

hbase git commit: HBASE-13834 Evict count not properly passed to HeapMemoryTuner. (Abhilash)

Repository: hbase
Updated Branches:
  refs/heads/master fef6d7f48 -> c1d970b04


HBASE-13834 Evict count not properly passed to HeapMemoryTuner. (Abhilash)


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

Branch: refs/heads/master
Commit: c1d970b04d27f4b34a5d4ccd981b9fe8fc326148
Parents: fef6d7f
Author: anoopsjohn <an...@gmail.com>
Authored: Sat Jun 6 08:07:45 2015 +0530
Committer: anoopsjohn <an...@gmail.com>
Committed: Sat Jun 6 08:07:45 2015 +0530

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/regionserver/HeapMemoryManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c1d970b0/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.java
index a66a29c..5448025 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HeapMemoryManager.java
@@ -264,10 +264,11 @@ public class HeapMemoryManager {
     }
 
     private void tune() {
-      evictCount = blockCache.getStats().getEvictedCount() - evictCount;
+      long curEvictCount = blockCache.getStats().getEvictedCount();
+      tunerContext.setEvictCount(curEvictCount - evictCount);
+      evictCount = curEvictCount;
       tunerContext.setBlockedFlushCount(blockedFlushCount.getAndSet(0));
       tunerContext.setUnblockedFlushCount(unblockedFlushCount.getAndSet(0));
-      tunerContext.setEvictCount(evictCount);
       tunerContext.setCurBlockCacheSize(blockCachePercent);
       tunerContext.setCurMemStoreSize(globalMemStorePercent);
       TunerResult result = null;