You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by bo...@apache.org on 2012/04/19 22:24:45 UTC
svn commit: r1328107 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
Author: bobby
Date: Thu Apr 19 20:24:45 2012
New Revision: 1328107
URL: http://svn.apache.org/viewvc?rev=1328107&view=rev
Log:
svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1328107&r1=1328106&r2=1328107&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu Apr 19 20:24:45 2012
@@ -272,6 +272,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4165. Committing is misspelled as commiting in task logs
(John Eagles via bobby)
+ MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via
+ bobby)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java?rev=1328107&r1=1328106&r2=1328107&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java Thu Apr 19 20:24:45 2012
@@ -201,7 +201,15 @@ public abstract class AbstractCounters<C
* @return the group
*/
public synchronized G getGroup(String groupName) {
- String newGroupName = filterGroupName(groupName);
+
+ // filterGroupName
+ boolean groupNameInLegacyMap = true;
+ String newGroupName = legacyMap.get(groupName);
+ if (newGroupName == null) {
+ groupNameInLegacyMap = false;
+ newGroupName = Limits.filterGroupName(groupName);
+ }
+
boolean isFGroup = isFrameworkGroup(newGroupName);
G group = isFGroup ? fgroups.get(newGroupName) : groups.get(newGroupName);
if (group == null) {
@@ -212,19 +220,14 @@ public abstract class AbstractCounters<C
limits.checkGroups(groups.size() + 1);
groups.put(newGroupName, group);
}
+ if (groupNameInLegacyMap) {
+ LOG.warn("Group " + groupName + " is deprecated. Use " + newGroupName
+ + " instead");
+ }
}
return group;
}
- private String filterGroupName(String oldName) {
- String newName = legacyMap.get(oldName);
- if (newName == null) {
- return Limits.filterGroupName(oldName);
- }
- LOG.warn("Group "+ oldName +" is deprecated. Use "+ newName +" instead");
- return newName;
- }
-
/**
* Returns the total number of counters, by summing the number of counters
* in each group.