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

Merge -c 1188997 from trunk to branch-0.23 to complete fix for MAPREDUCE-3263. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188998 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-10-26 02:13:29 +00:00
parent d22a142f94
commit d78033e453
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1709,6 +1709,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3253. Fixed ContextFactory to clone JobContext correctly. MAPREDUCE-3253. Fixed ContextFactory to clone JobContext correctly.
(acmurthy) (acmurthy)
MAPREDUCE-3263. Fixed the MAPREDUCE-3028 commit which broke MR1. (Hitesh
Shah via acmurthy)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java
View File

@ -130,8 +130,8 @@ public abstract class NotificationTestCase extends HadoopTestCase {
protected JobConf createJobConf() { protected JobConf createJobConf() {
JobConf conf = super.createJobConf(); JobConf conf = super.createJobConf();
conf.setJobEndNotificationURI(getNotificationUrlTemplate()); conf.setJobEndNotificationURI(getNotificationUrlTemplate());
conf.setInt(JobContext.END_NOTIFICATION_RETRIES, 3); conf.setInt(JobContext.MR_JOB_END_RETRY_ATTEMPTS, 3);
conf.setInt(JobContext.END_NOTIFICATION_RETRIE_INTERVAL, 200); conf.setInt(JobContext.MR_JOB_END_RETRY_INTERVAL, 200);
return conf; return conf;
} }