From 878f801a95d96d248b4c24aea28e56bf19a6b655 Mon Sep 17 00:00:00 2001 From: chenheng Date: Fri, 22 Apr 2016 16:10:35 +0800 Subject: [PATCH] HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater than zero --- .../org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon | 2 +- .../src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon index 49a1e1b..924ebbd 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon @@ -192,7 +192,7 @@ org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix; <%if mean > 0 %> Mean - <% String.format("%,d", (long)(ageAtEvictionSnapshot.getMean()/(1000000 * 1000))) %> + <% String.format("%,d", (long)ageAtEvictionSnapshot.getMean()) %> Mean age of Blocks at eviction time (seconds) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java index e31c340..69579bc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java @@ -224,7 +224,7 @@ public class BlockCacheUtil { this.dataBlockCount++; this.dataSize += cb.getSize(); } - long age = this.now - cb.getCachedTime(); + long age = (this.now - cb.getCachedTime())/1000000000; this.hist.add(age, 1); return false; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java index 8de2a03..1412cad 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java @@ -248,7 +248,7 @@ public class CacheStats { } public void evicted(final long t, boolean primary) { - if (t > this.startTime) this.ageAtEviction.add(t - this.startTime,1); + if (t > this.startTime) this.ageAtEviction.add((t - this.startTime)/1000000000,1); this.evictedBlockCount.increment(); if (primary) { primaryEvictedBlockCount.increment(); -- 1.9.3 (Apple Git-50)