Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1379021:1379022 from trunk to branch-2. Fixes: MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379023 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2012-08-30 17:14:07 +00:00
parent e80fffcf66
commit 9f94b89742
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -61,6 +61,9 @@ Branch-2 ( Unreleased changes )
MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
(tucu via tomwhite)
MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in
MR2. (tomwhite)
Release 2.1.0-alpha - Unreleased
INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
View File

@ -20,12 +20,14 @@ package org.apache.hadoop.mapreduce.counters;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.JobConf;
import static org.apache.hadoop.mapreduce.MRJobConfig.*;
@InterfaceAudience.Private
public class Limits {
static final Configuration conf = new Configuration();
static final Configuration conf = new JobConf();
public static final int GROUP_NAME_MAX =
conf.getInt(COUNTER_GROUP_NAME_MAX_KEY, COUNTER_GROUP_NAME_MAX_DEFAULT);
public static final int COUNTER_NAME_MAX =

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
View File

@ -376,6 +376,8 @@ public class ConfigUtil {
new String[] {MRJobConfig.REDUCE_SKIP_MAXGROUPS});
Configuration.addDeprecation("mapred.reduce.child.log.level",
new String[] {MRJobConfig.REDUCE_LOG_LEVEL});
Configuration.addDeprecation("mapreduce.job.counters.limit",
new String[] {MRJobConfig.COUNTERS_MAX_KEY});
Configuration.addDeprecation("jobclient.completion.poll.interval",
new String[] {Job.COMPLETION_POLL_INTERVAL_KEY});
Configuration.addDeprecation("jobclient.progress.monitor.poll.interval",