Repository: hadoop Updated Branches: refs/heads/branch-2 c9c1d9a5a -> 9129b3415
MAPREDUCE-5335. Rename Job Tracker terminology in ShuffleSchedulerImpl. Contributed by Devaraj K. (cherry picked from commit b42d09eb62bd1725d70da59f1a6fdac83cea82d1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9129b341 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9129b341 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9129b341 Branch: refs/heads/branch-2 Commit: 9129b3415c265c59cd25d0ec976e5a838ecc7089 Parents: c9c1d9a Author: Tsuyoshi Ozawa <[email protected]> Authored: Thu Feb 12 20:08:29 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Thu Feb 12 20:08:47 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../hadoop/mapreduce/task/reduce/ShuffleSchedulerImpl.java | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9129b341/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index cb8a6c2..1182d3b 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -46,6 +46,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-6253. Update use of Iterator to Iterable. (Ray Chiang via devaraj) + MAPREDUCE-5335. Rename Job Tracker terminology in ShuffleSchedulerImpl. + (devaraj via ozawa) + OPTIMIZATIONS MAPREDUCE-6169. MergeQueue should release reference to the current item http://git-wip-us.apache.org/repos/asf/hadoop/blob/9129b341/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleSchedulerImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleSchedulerImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleSchedulerImpl.java index 985a1e1..37f4af3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleSchedulerImpl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleSchedulerImpl.java @@ -274,7 +274,8 @@ public class ShuffleSchedulerImpl<K,V> implements ShuffleScheduler<K,V> { } } - checkAndInformJobTracker(failures, mapId, readError, connectExcpt, hostFail); + checkAndInformMRAppMaster(failures, mapId, readError, connectExcpt, + hostFail); checkReducerHealth(); @@ -299,15 +300,15 @@ public class ShuffleSchedulerImpl<K,V> implements ShuffleScheduler<K,V> { reporter.reportException(ioe); } - // Notify the JobTracker + // Notify the MRAppMaster // after every read error, if 'reportReadErrorImmediately' is true or // after every 'maxFetchFailuresBeforeReporting' failures - private void checkAndInformJobTracker( + private void checkAndInformMRAppMaster( int failures, TaskAttemptID mapId, boolean readError, boolean connectExcpt, boolean hostFailed) { if (connectExcpt || (reportReadErrorImmediately && readError) || ((failures % maxFetchFailuresBeforeReporting) == 0) || hostFailed) { - LOG.info("Reporting fetch failure for " + mapId + " to jobtracker."); + LOG.info("Reporting fetch failure for " + mapId + " to MRAppMaster."); status.addFetchFailedMap((org.apache.hadoop.mapred.TaskAttemptID) mapId); } }
