MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1379022 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
ec94ea2658
commit
2f1a133dcf
|
@ -187,6 +187,9 @@ Branch-2 ( Unreleased changes )
|
||||||
MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
|
MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
|
||||||
(tucu via tomwhite)
|
(tucu via tomwhite)
|
||||||
|
|
||||||
|
MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in
|
||||||
|
MR2. (tomwhite)
|
||||||
|
|
||||||
Release 2.1.0-alpha - Unreleased
|
Release 2.1.0-alpha - Unreleased
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -20,12 +20,14 @@ package org.apache.hadoop.mapreduce.counters;
|
||||||
|
|
||||||
import org.apache.hadoop.classification.InterfaceAudience;
|
import org.apache.hadoop.classification.InterfaceAudience;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
import org.apache.hadoop.mapred.JobConf;
|
||||||
|
|
||||||
import static org.apache.hadoop.mapreduce.MRJobConfig.*;
|
import static org.apache.hadoop.mapreduce.MRJobConfig.*;
|
||||||
|
|
||||||
@InterfaceAudience.Private
|
@InterfaceAudience.Private
|
||||||
public class Limits {
|
public class Limits {
|
||||||
|
|
||||||
static final Configuration conf = new Configuration();
|
static final Configuration conf = new JobConf();
|
||||||
public static final int GROUP_NAME_MAX =
|
public static final int GROUP_NAME_MAX =
|
||||||
conf.getInt(COUNTER_GROUP_NAME_MAX_KEY, COUNTER_GROUP_NAME_MAX_DEFAULT);
|
conf.getInt(COUNTER_GROUP_NAME_MAX_KEY, COUNTER_GROUP_NAME_MAX_DEFAULT);
|
||||||
public static final int COUNTER_NAME_MAX =
|
public static final int COUNTER_NAME_MAX =
|
||||||
|
|
|
@ -376,6 +376,8 @@ public class ConfigUtil {
|
||||||
new String[] {MRJobConfig.REDUCE_SKIP_MAXGROUPS});
|
new String[] {MRJobConfig.REDUCE_SKIP_MAXGROUPS});
|
||||||
Configuration.addDeprecation("mapred.reduce.child.log.level",
|
Configuration.addDeprecation("mapred.reduce.child.log.level",
|
||||||
new String[] {MRJobConfig.REDUCE_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",
|
Configuration.addDeprecation("jobclient.completion.poll.interval",
|
||||||
new String[] {Job.COMPLETION_POLL_INTERVAL_KEY});
|
new String[] {Job.COMPLETION_POLL_INTERVAL_KEY});
|
||||||
Configuration.addDeprecation("jobclient.progress.monitor.poll.interval",
|
Configuration.addDeprecation("jobclient.progress.monitor.poll.interval",
|
||||||
|
|
Loading…
Reference in New Issue