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

MAPREDUCE-5335. Rename Job Tracker terminology in ShuffleSchedulerImpl. Contributed by Devaraj K. 

(cherry picked from commit b42d09eb62)
This commit is contained in:
Tsuyoshi Ozawa 2015-02-12 20:08:29 +09:00
parent c9c1d9a5a6
commit 9129b3415c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,9 @@ Release 2.7.0 - UNRELEASED
MAPREDUCE-6253. Update use of Iterator to Iterable. (Ray Chiang via devaraj) MAPREDUCE-6253. Update use of Iterator to Iterable. (Ray Chiang via devaraj)
MAPREDUCE-5335. Rename Job Tracker terminology in ShuffleSchedulerImpl.
(devaraj via ozawa)
OPTIMIZATIONS OPTIMIZATIONS
MAPREDUCE-6169. MergeQueue should release reference to the current item MAPREDUCE-6169. MergeQueue should release reference to the current item

9
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleSchedulerImpl.java
View File

@ -274,7 +274,8 @@ public synchronized void copyFailed(TaskAttemptID mapId, MapHost host,
} }
} }
checkAndInformJobTracker(failures, mapId, readError, connectExcpt, hostFail); checkAndInformMRAppMaster(failures, mapId, readError, connectExcpt,
hostFail);
checkReducerHealth(); checkReducerHealth();
@ -299,15 +300,15 @@ public void reportLocalError(IOException ioe) {
reporter.reportException(ioe); reporter.reportException(ioe);
} }
// Notify the JobTracker // Notify the MRAppMaster
// after every read error, if 'reportReadErrorImmediately' is true or // after every read error, if 'reportReadErrorImmediately' is true or
// after every 'maxFetchFailuresBeforeReporting' failures // after every 'maxFetchFailuresBeforeReporting' failures
private void checkAndInformJobTracker( private void checkAndInformMRAppMaster(
int failures, TaskAttemptID mapId, boolean readError, int failures, TaskAttemptID mapId, boolean readError,
boolean connectExcpt, boolean hostFailed) { boolean connectExcpt, boolean hostFailed) {
if (connectExcpt || (reportReadErrorImmediately && readError) if (connectExcpt || (reportReadErrorImmediately && readError)
|| ((failures % maxFetchFailuresBeforeReporting) == 0) || hostFailed) { || ((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); status.addFetchFailedMap((org.apache.hadoop.mapred.TaskAttemptID) mapId);
} }
} }