From 5f16c98ad66b562760d5d947151a38f14875d21a Mon Sep 17 00:00:00 2001 From: Jian He Date: Fri, 26 Sep 2014 17:56:28 -0700 Subject: [PATCH] MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA --- .../hadoop-common/src/site/apt/DeprecatedProperties.apt.vm | 2 ++ hadoop-mapreduce-project/CHANGES.txt | 4 ++++ .../main/java/org/apache/hadoop/mapreduce/MRJobConfig.java | 2 +- .../java/org/apache/hadoop/mapreduce/util/ConfigUtil.java | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm index 258af0fe2b9..c4f3b1ee7ec 100644 --- a/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm +++ b/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm @@ -537,6 +537,8 @@ Deprecated Properties |user.name | mapreduce.job.user.name *---+---+ |webinterface.private.actions | mapreduce.jobtracker.webinterface.trusted +*---+---+ +|yarn.app.mapreduce.yarn.app.mapreduce.client-am.ipc.max-retries-on-timeouts | yarn.app.mapreduce.client-am.ipc.max-retries-on-timeouts *---+---+ The following table lists additional changes to some configuration properties: diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 6c9685ca3e8..934491e27f3 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -390,6 +390,10 @@ Release 2.6.0 - UNRELEASED MAPREDUCE-5945. Update the description of GenericOptionsParser -jt option (Akira AJISAKA via aw) + MAPREDUCE-6087. Fixed wrong config name of + MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by + Akira AJISAKA. (Akira AJISAKA via jianhe) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java index e39dd6a30cd..562120f6feb 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java @@ -392,7 +392,7 @@ public interface MRJobConfig { * reconnecting to the RM to fetch Application Status. */ public static final String MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS = - MR_PREFIX + "yarn.app.mapreduce.client-am.ipc.max-retries-on-timeouts"; + MR_PREFIX + "client-am.ipc.max-retries-on-timeouts"; public static final int DEFAULT_MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS = 3; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java index 450f3664355..8c7952bc87f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java @@ -180,6 +180,8 @@ public class ConfigUtil { TTConfig.TT_LOCAL_CACHE_SIZE), new DeprecationDelta("tasktracker.contention.tracking", TTConfig.TT_CONTENTION_TRACKING), + new DeprecationDelta("yarn.app.mapreduce.yarn.app.mapreduce.client-am.ipc.max-retries-on-timeouts", + MRJobConfig.MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS), new DeprecationDelta("job.end.notification.url", MRJobConfig.MR_JOB_END_NOTIFICATION_URL), new DeprecationDelta("job.end.retry.attempts",