hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jia...@apache.org
Subject git commit: MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS. Contributed by Akira AJISAKA (cherry picked from commit 5f16c98ad66b562760d5d947151a38f14875d21a)
Date Sat, 27 Sep 2014 01:06:28 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 cb08ed148 -> a6879b606


MAPREDUCE-6087. Fixed wrong config name of MRJobConfig#MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS.
Contributed by Akira AJISAKA
(cherry picked from commit 5f16c98ad66b562760d5d947151a38f14875d21a)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a6879b60
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a6879b60
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a6879b60

Branch: refs/heads/branch-2
Commit: a6879b606e2960f1d3e719c77b1f03c9a1c4ee9b
Parents: cb08ed1
Author: Jian He <jianhe@apache.org>
Authored: Fri Sep 26 17:56:28 2014 -0700
Committer: Jian He <jianhe@apache.org>
Committed: Fri Sep 26 18:06:19 2014 -0700

----------------------------------------------------------------------
 .../hadoop-common/src/site/apt/DeprecatedProperties.apt.vm       | 2 ++
 hadoop-mapreduce-project/CHANGES.txt                             | 4 ++++
 .../src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java   | 2 +-
 .../main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java   | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6879b60/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
----------------------------------------------------------------------
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 258af0f..c4f3b1e 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
@@ -538,6 +538,8 @@ Deprecated Properties
 *---+---+
 |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:
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6879b60/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 462e370..872e58a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -171,6 +171,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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6879b60/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java
----------------------------------------------------------------------
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 d2199c3..5c82470 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
@@ -387,7 +387,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;
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6879b60/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
----------------------------------------------------------------------
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 450f366..8c7952b 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",


Mime
View raw message