From d337a5ffc459cf68395423bcff71d38e0b7c3dbf Mon Sep 17 00:00:00 2001
From: Jing Zhao <jing9@apache.org>
Date: Wed, 26 Mar 2014 20:32:42 +0000
Subject: [PATCH] HADOOP-10441. Namenode metric
 rpc.RetryCache/NameNodeRetryCache.CacheHit can't be correctly processed by
 Ganglia. Contributed by Jing Zhao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1582043 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt                | 3 +++
 .../java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java  | 2 +-
 .../test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 01a762ef622..3066b1edb16 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -460,6 +460,9 @@ Release 2.4.0 - UNRELEASED
     HADOOP-10437. Fix the javac warnings in the conf and the util package.
     (szetszwo)
 
+    HADOOP-10441. Namenode metric "rpc.RetryCache/NameNodeRetryCache.CacheHit"
+    can't be correctly processed by Ganglia. (jing9)
+
   BREAKDOWN OF HADOOP-10184 SUBTASKS AND RELATED JIRAS
 
     HADOOP-10185. FileSystem API for ACLs. (cnauroth)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java
index 7ca5baa6a1c..a853d642e2f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java
@@ -40,7 +40,7 @@ public class RetryCacheMetrics {
   final String name;
 
   RetryCacheMetrics(RetryCache retryCache) {
-    name = "RetryCache/"+ retryCache.getCacheName();
+    name = "RetryCache."+ retryCache.getCacheName();
     registry = new MetricsRegistry(name);
     if (LOG.isDebugEnabled()) {
       LOG.debug("Initialized "+ registry);
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java
index b7d8f7d0bcd..b95286ccb51 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java
@@ -51,7 +51,7 @@ public void testNames() {
   }
 
   private void checkMetrics(long hit, long cleared, long updated) {
-    MetricsRecordBuilder rb = getMetrics("RetryCache/" + cacheName);
+    MetricsRecordBuilder rb = getMetrics("RetryCache." + cacheName);
     assertCounter("CacheHit", hit, rb);
     assertCounter("CacheCleared", cleared, rb);
     assertCounter("CacheUpdated", updated, rb);