hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject svn commit: r1582048 - in /hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java
Date Wed, 26 Mar 2014 20:37:15 GMT
Author: jing9
Date: Wed Mar 26 20:37:15 2014
New Revision: 1582048

URL: http://svn.apache.org/r1582048
Log:
HADOOP-10441. Merge r1582044 from branch-2.

Modified:
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java
    hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java

Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1582048&r1=1582047&r2=1582048&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/CHANGES.txt Wed
Mar 26 20:37:15 2014
@@ -132,6 +132,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)

Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java?rev=1582048&r1=1582047&r2=1582048&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java
(original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RetryCacheMetrics.java
Wed Mar 26 20:37:15 2014
@@ -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);

Modified: hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java?rev=1582048&r1=1582047&r2=1582048&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java
(original)
+++ hadoop/common/branches/branch-2.4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRetryCacheMetrics.java
Wed Mar 26 20:37:15 2014
@@ -51,7 +51,7 @@ public class TestRetryCacheMetrics {
   }
 
   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);



Mime
View raw message