HADOOP-10441. Merge r1582043 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582044 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8ae6d5b5bd
commit
8dc3ad11a9
|
@ -159,6 +159,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)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue