[46/50] hbase git commit: HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater than zero

2016-11-01 Thread larsh 
HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater 
than zero

Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java


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

Branch: refs/heads/branch-1.0
Commit: a049e518f3c1967de1668a4c5e618705ab11fb02
Parents: 89b432d
Author: chenheng 
Authored: Thu Aug 18 10:28:06 2016 +0800
Committer: chenheng 
Committed: Thu Aug 18 11:00:35 2016 +0800

--
 .../hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon  | 11 ++-
 .../org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java |  4 +++-
 .../org/apache/hadoop/hbase/io/hfile/CacheStats.java |  4 +++-
 3 files changed, 8 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a049e518/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
--
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 9883848..f5485c2 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
@@ -176,9 +176,6 @@ org.apache.hadoop.util.StringUtils;
 
 <%java>
   AgeSnapshot ageAtEvictionSnapshot = bc.getStats().getAgeAtEvictionSnapshot();
-  // Only show if non-zero mean and stddev as is the case in combinedblockcache
-  double mean = ageAtEvictionSnapshot.getMean();
-  double stddev = ageAtEvictionSnapshot.getStdDev();
 
 
 Evicted
@@ -190,20 +187,16 @@ org.apache.hadoop.util.StringUtils;
 <% String.format("%,d", bc.getStats().getEvictionCount()) %>
 The total number of times an eviction has occurred
 
-<%if mean > 0 %>
 
 Mean
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getMean()/(100 * 1000))) %>
+<% String.format("%,d", (long)(ageAtEvictionSnapshot.getMean())) 
%>
 Mean age of Blocks at eviction time (seconds)
 
-
-<%if stddev > 0 %>
 
 StdDev
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getStdDev()/100)) %>
+<% String.format("%,d", (long)(ageAtEvictionSnapshot.getStdDev())) 
%>
 Standard Deviation for age of Blocks at eviction time
 
-
 
 
 <%def bc_stats>

http://git-wip-us.apache.org/repos/asf/hbase/blob/a049e518/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
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 94638da..2d3f524 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
@@ -41,6 +41,8 @@ import com.yammer.metrics.stats.Snapshot;
  */
 @InterfaceAudience.Private
 public class BlockCacheUtil {
+
+  public static final long NANOS_PER_SECOND = 10;
   /**
* Needed making histograms.
*/
@@ -225,7 +227,7 @@ public class BlockCacheUtil {
 this.dataBlockCount++;
 this.dataSize += cb.getSize();
   }
-  long age = this.now - cb.getCachedTime();
+  long age = (this.now - cb.getCachedTime())/NANOS_PER_SECOND;
   this.age.update(age);
   return false;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/a049e518/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java
--
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 00accfc..ba5fbf4 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
@@ -131,7 +131,9 @@ public class CacheStats {
   }
 
   public void evicted(final long t) {
-if (t > this.startTime) this.ageAtEviction.update(t - this.startTime);
+if (t > this.startTime) {
+  this.ageAtEviction.update((t - 
this.startTime)/BlockCacheUtil.NANOS_PER_SECOND);
+}
 this.evictedBlockCount.incrementAndGet();
   }

hbase git commit: HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater than zero

2016-08-17 Thread chenheng 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 89b432d45 -> a049e518f


HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater 
than zero

Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java


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

Branch: refs/heads/branch-1.0
Commit: a049e518f3c1967de1668a4c5e618705ab11fb02
Parents: 89b432d
Author: chenheng 
Authored: Thu Aug 18 10:28:06 2016 +0800
Committer: chenheng 
Committed: Thu Aug 18 11:00:35 2016 +0800

--
 .../hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon  | 11 ++-
 .../org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java |  4 +++-
 .../org/apache/hadoop/hbase/io/hfile/CacheStats.java |  4 +++-
 3 files changed, 8 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a049e518/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
--
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 9883848..f5485c2 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
@@ -176,9 +176,6 @@ org.apache.hadoop.util.StringUtils;
 
 <%java>
   AgeSnapshot ageAtEvictionSnapshot = bc.getStats().getAgeAtEvictionSnapshot();
-  // Only show if non-zero mean and stddev as is the case in combinedblockcache
-  double mean = ageAtEvictionSnapshot.getMean();
-  double stddev = ageAtEvictionSnapshot.getStdDev();
 
 
 Evicted
@@ -190,20 +187,16 @@ org.apache.hadoop.util.StringUtils;
 <% String.format("%,d", bc.getStats().getEvictionCount()) %>
 The total number of times an eviction has occurred
 
-<%if mean > 0 %>
 
 Mean
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getMean()/(100 * 1000))) %>
+<% String.format("%,d", (long)(ageAtEvictionSnapshot.getMean())) 
%>
 Mean age of Blocks at eviction time (seconds)
 
-
-<%if stddev > 0 %>
 
 StdDev
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getStdDev()/100)) %>
+<% String.format("%,d", (long)(ageAtEvictionSnapshot.getStdDev())) 
%>
 Standard Deviation for age of Blocks at eviction time
 
-
 
 
 <%def bc_stats>

http://git-wip-us.apache.org/repos/asf/hbase/blob/a049e518/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
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 94638da..2d3f524 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
@@ -41,6 +41,8 @@ import com.yammer.metrics.stats.Snapshot;
  */
 @InterfaceAudience.Private
 public class BlockCacheUtil {
+
+  public static final long NANOS_PER_SECOND = 10;
   /**
* Needed making histograms.
*/
@@ -225,7 +227,7 @@ public class BlockCacheUtil {
 this.dataBlockCount++;
 this.dataSize += cb.getSize();
   }
-  long age = this.now - cb.getCachedTime();
+  long age = (this.now - cb.getCachedTime())/NANOS_PER_SECOND;
   this.age.update(age);
   return false;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/a049e518/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java
--
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 00accfc..ba5fbf4 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
@@ -131,7 +131,9 @@ public class CacheStats {
   }
 
   public void evicted(final long t) {
-if (t > this.startTime) this.ageAtEviction.update(t - this.startTime);
+if (t > this.startTime) {
+  this.ageAtEviction.update((t - 
this.startTime)/BlockCacheUtil.NANOS_PER_SECOND);
+}

hbase git commit: HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater than zero

2016-08-17 Thread chenheng 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 d82cf96f2 -> 941ad56e7


HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater 
than zero

Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java


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

Branch: refs/heads/branch-1.1
Commit: 941ad56e7fac6defe4978a35e46f28098f3e1439
Parents: d82cf96
Author: chenheng 
Authored: Thu Aug 18 10:28:06 2016 +0800
Committer: chenheng 
Committed: Thu Aug 18 10:57:42 2016 +0800

--
 .../hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon  | 11 ++-
 .../org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java |  4 +++-
 .../org/apache/hadoop/hbase/io/hfile/CacheStats.java |  4 +++-
 3 files changed, 8 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/941ad56e/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
--
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 6986f12..a25c224 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
@@ -176,9 +176,6 @@ org.apache.hadoop.util.StringUtils;
 
 <%java>
   AgeSnapshot ageAtEvictionSnapshot = bc.getStats().getAgeAtEvictionSnapshot();
-  // Only show if non-zero mean and stddev as is the case in combinedblockcache
-  double mean = ageAtEvictionSnapshot.getMean();
-  double stddev = ageAtEvictionSnapshot.getStdDev();
 
 
 Evicted
@@ -190,20 +187,16 @@ org.apache.hadoop.util.StringUtils;
 <% String.format("%,d", bc.getStats().getEvictionCount()) %>
 The total number of times an eviction has occurred
 
-<%if mean > 0 %>
 
 Mean
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getMean()/(100 * 1000))) %>
+<% String.format("%,d", (long)(ageAtEvictionSnapshot.getMean())) 
%>
 Mean age of Blocks at eviction time (seconds)
 
-
-<%if stddev > 0 %>
 
 StdDev
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getStdDev()/100)) %>
+<% String.format("%,d", (long)(ageAtEvictionSnapshot.getStdDev())) 
%>
 Standard Deviation for age of Blocks at eviction time
 
-
 
 
 <%def hits_tmpl>

http://git-wip-us.apache.org/repos/asf/hbase/blob/941ad56e/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
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 94638da..2d3f524 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
@@ -41,6 +41,8 @@ import com.yammer.metrics.stats.Snapshot;
  */
 @InterfaceAudience.Private
 public class BlockCacheUtil {
+
+  public static final long NANOS_PER_SECOND = 10;
   /**
* Needed making histograms.
*/
@@ -225,7 +227,7 @@ public class BlockCacheUtil {
 this.dataBlockCount++;
 this.dataSize += cb.getSize();
   }
-  long age = this.now - cb.getCachedTime();
+  long age = (this.now - cb.getCachedTime())/NANOS_PER_SECOND;
   this.age.update(age);
   return false;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/941ad56e/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java
--
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 00accfc..ba5fbf4 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
@@ -131,7 +131,9 @@ public class CacheStats {
   }
 
   public void evicted(final long t) {
-if (t > this.startTime) this.ageAtEviction.update(t - this.startTime);
+if (t > this.startTime) {
+  this.ageAtEviction.update((t - 
this.startTime)/BlockCacheUtil.NANOS_PER_SECOND);
+}

hbase git commit: HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater than zero

2016-08-17 Thread chenheng 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 ca1b49dd0 -> a84ff653a


HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater 
than zero


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

Branch: refs/heads/branch-1.2
Commit: a84ff653ad2af8102d2acbf6102634b477cb7c8b
Parents: ca1b49d
Author: chenheng 
Authored: Thu Aug 18 10:28:06 2016 +0800
Committer: chenheng 
Committed: Thu Aug 18 10:36:16 2016 +0800

--
 .../hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon  | 11 ++-
 .../org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java |  4 +++-
 .../org/apache/hadoop/hbase/io/hfile/CacheStats.java |  4 +++-
 3 files changed, 8 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a84ff653/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
--
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 00b36c3..2114539 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
@@ -176,9 +176,6 @@ org.apache.hadoop.util.StringUtils;
 
 <%java>
   AgeSnapshot ageAtEvictionSnapshot = bc.getStats().getAgeAtEvictionSnapshot();
-  // Only show if non-zero mean and stddev as is the case in combinedblockcache
-  double mean = ageAtEvictionSnapshot.getMean();
-  double stddev = ageAtEvictionSnapshot.getStdDev();
 
 
 Evicted
@@ -190,20 +187,16 @@ org.apache.hadoop.util.StringUtils;
 <% String.format("%,d", bc.getStats().getEvictionCount()) %>
 The total number of times an eviction has occurred
 
-<%if mean > 0 %>
 
 Mean
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getMean()/(100 * 1000))) %>
+<% String.format("%,d", (long)(ageAtEvictionSnapshot.getMean())) 
%>
 Mean age of Blocks at eviction time (seconds)
 
-
-<%if stddev > 0 %>
 
 StdDev
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getStdDev()/100)) %>
+<% String.format("%,d", (long)(ageAtEvictionSnapshot.getStdDev())) 
%>
 Standard Deviation for age of Blocks at eviction time
 
-
 
 
 <%def hits_tmpl>

http://git-wip-us.apache.org/repos/asf/hbase/blob/a84ff653/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
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 05eb019..247b6be 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
@@ -41,6 +41,8 @@ import com.yammer.metrics.stats.Snapshot;
  */
 @InterfaceAudience.Private
 public class BlockCacheUtil {
+
+  public static final long NANOS_PER_SECOND = 10;
   /**
* Needed making histograms.
*/
@@ -231,7 +233,7 @@ public class BlockCacheUtil {
 this.dataBlockCount++;
 this.dataSize += cb.getSize();
   }
-  long age = this.now - cb.getCachedTime();
+  long age = (this.now - cb.getCachedTime())/NANOS_PER_SECOND;
   this.age.update(age);
   return false;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/a84ff653/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java
--
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 fff6585..78f022f 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
@@ -150,7 +150,9 @@ public class CacheStats {
   }
 
   public void evicted(final long t, boolean primary) {
-if (t > this.startTime) this.ageAtEviction.update(t - this.startTime);
+if (t > this.startTime) {
+  this.ageAtEviction.update((t - 
this.startTime)/BlockCacheUtil.NANOS_PER_SECOND);
+}
 this.evictedBlockCount.incrementAndGet();
 if (primary) {

hbase git commit: HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater than zero

2016-08-17 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 a944a1987 -> 3d7bcd020


HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater 
than zero

Signed-off-by: stack 


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

Branch: refs/heads/branch-1
Commit: 3d7bcd020e03ca89dccab18dd87cde453beeeafa
Parents: a944a19
Author: chenheng 
Authored: Wed Aug 17 11:06:34 2016 +0800
Committer: stack 
Committed: Wed Aug 17 10:59:58 2016 -0700

--
 .../apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon | 6 +-
 .../java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java  | 6 +-
 .../main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java | 4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/3d7bcd02/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
--
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..daa5d76 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
@@ -177,7 +177,6 @@ org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
 <%java>
   AgeSnapshot ageAtEvictionSnapshot = bc.getStats().getAgeAtEvictionSnapshot();
   // Only show if non-zero mean and stddev as is the case in combinedblockcache
-  double mean = ageAtEvictionSnapshot.getMean();
 
 
 Evicted
@@ -189,13 +188,11 @@ 
org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
 <% String.format("%,d", bc.getStats().getEvictionCount()) %>
 The total number of times an eviction has occurred
 
-<%if mean > 0 %>
 
 Mean
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getMean()/(100 * 1000))) %>
+<% String.format("%,d", (long)ageAtEvictionSnapshot.getMean()) 
%>
 Mean age of Blocks at eviction time (seconds)
 
-
 
 
 <%def hits_tmpl>
@@ -288,7 +285,6 @@ are combined counts. Request count is sum of hits and 
misses.
 boolean evictions;
 
 <%java>
-  final long nanosPerSecond = 10;
   String bcUrl = "http://hbase.apache.org/devapidocs/; + 
bc.getClass().getName().replaceAll("\\.", "/") + ".html";
   String bcName = bc.getClass().getSimpleName();
   org.apache.hadoop.hbase.io.hfile.BlockCacheUtil.CachedBlocksByFile cbsbf =

http://git-wip-us.apache.org/repos/asf/hbase/blob/3d7bcd02/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
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 89f73eb..d868a1a 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
@@ -38,6 +38,10 @@ import org.codehaus.jackson.map.SerializationConfig;
  */
 @InterfaceAudience.Private
 public class BlockCacheUtil {
+
+
+  public static final long NANOS_PER_SECOND = 10;
+
   /**
* Needed generating JSON.
*/
@@ -223,7 +227,7 @@ public class BlockCacheUtil {
 this.dataBlockCount++;
 this.dataSize += cb.getSize();
   }
-  long age = this.now - cb.getCachedTime();
+  long age = (this.now - cb.getCachedTime())/NANOS_PER_SECOND;
   this.hist.add(age, 1);
   return false;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/3d7bcd02/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java
--
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 298dcf7..f38ec70 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
@@ -247,7 +247,9 @@ 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

[2/2] hbase git commit: HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater than zero

2016-08-17 Thread stack 
HBASE-15635 Mean age of Blocks in cache (seconds) on webUI should be greater 
than zero

Signed-off-by: stack 


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

Branch: refs/heads/master
Commit: fb4ef5357115c708b0857bdce0a0c2f4d38fdd10
Parents: 2261c8c
Author: chenheng 
Authored: Wed Aug 17 11:06:34 2016 +0800
Committer: stack 
Committed: Wed Aug 17 10:59:00 2016 -0700

--
 .../apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon | 6 +-
 .../java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java  | 6 +-
 .../main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java | 4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/fb4ef535/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
--
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..daa5d76 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
@@ -177,7 +177,6 @@ org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
 <%java>
   AgeSnapshot ageAtEvictionSnapshot = bc.getStats().getAgeAtEvictionSnapshot();
   // Only show if non-zero mean and stddev as is the case in combinedblockcache
-  double mean = ageAtEvictionSnapshot.getMean();
 
 
 Evicted
@@ -189,13 +188,11 @@ 
org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
 <% String.format("%,d", bc.getStats().getEvictionCount()) %>
 The total number of times an eviction has occurred
 
-<%if mean > 0 %>
 
 Mean
-<% String.format("%,d", 
(long)(ageAtEvictionSnapshot.getMean()/(100 * 1000))) %>
+<% String.format("%,d", (long)ageAtEvictionSnapshot.getMean()) 
%>
 Mean age of Blocks at eviction time (seconds)
 
-
 
 
 <%def hits_tmpl>
@@ -288,7 +285,6 @@ are combined counts. Request count is sum of hits and 
misses.
 boolean evictions;
 
 <%java>
-  final long nanosPerSecond = 10;
   String bcUrl = "http://hbase.apache.org/devapidocs/; + 
bc.getClass().getName().replaceAll("\\.", "/") + ".html";
   String bcName = bc.getClass().getSimpleName();
   org.apache.hadoop.hbase.io.hfile.BlockCacheUtil.CachedBlocksByFile cbsbf =

http://git-wip-us.apache.org/repos/asf/hbase/blob/fb4ef535/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
--
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..3c11149 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
@@ -39,6 +39,10 @@ import org.codehaus.jackson.map.SerializationConfig;
  */
 @InterfaceAudience.Private
 public class BlockCacheUtil {
+
+
+  public static final long NANOS_PER_SECOND = 10;
+
   /**
* Needed generating JSON.
*/
@@ -224,7 +228,7 @@ public class BlockCacheUtil {
 this.dataBlockCount++;
 this.dataSize += cb.getSize();
   }
-  long age = this.now - cb.getCachedTime();
+  long age = (this.now - cb.getCachedTime())/NANOS_PER_SECOND;
   this.hist.add(age, 1);
   return false;
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/fb4ef535/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheStats.java
--
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..04f6a1e 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,9 @@ 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) / 
BlockCacheUtil.NANOS_PER_SECOND, 1);
+}