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

MAPREDUCE-3564. Fixed failures in TestStagingCleanup and TestJobEndNotifier tests. Contributed by Siddharth Seth. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215022 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2011-12-16 02:09:00 +00:00
parent c2fe4a7e83
commit f73bd5402e
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,6 +317,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3487. Fixed JobHistory web-UI to display links to single task's MAPREDUCE-3487. Fixed JobHistory web-UI to display links to single task's
counters' page. (Jason Lowe via vinodkv) counters' page. (Jason Lowe via vinodkv)
MAPREDUCE-3564. Fixed failures in TestStagingCleanup and TestJobEndNotifier
tests. (Siddharth Seth via vinodkv)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

20
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
View File

@ -375,15 +375,17 @@ public class MRAppMaster extends CompositeService {
// this is the only job, so shut down the Appmaster // this is the only job, so shut down the Appmaster
// note in a workflow scenario, this may lead to creation of a new // note in a workflow scenario, this may lead to creation of a new
// job (FIXME?) // job (FIXME?)
try { if (getConfig().get(MRJobConfig.MR_JOB_END_NOTIFICATION_URL) != null) {
LOG.info("Job end notification started for jobID : " try {
+ job.getReport().getJobId()); LOG.info("Job end notification started for jobID : "
JobEndNotifier notifier = new JobEndNotifier(); + job.getReport().getJobId());
notifier.setConf(getConfig()); JobEndNotifier notifier = new JobEndNotifier();
notifier.notify(job.getReport()); notifier.setConf(getConfig());
} catch (InterruptedException ie) { notifier.notify(job.getReport());
LOG.warn("Job end notification interrupted for jobID : " } catch (InterruptedException ie) {
+ job.getReport().getJobId(), ie ); LOG.warn("Job end notification interrupted for jobID : "
+ job.getReport().getJobId(), ie);
}
} }
// TODO:currently just wait for some time so clients can know the // TODO:currently just wait for some time so clients can know the

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestJobEndNotifier.java
View File

@ -96,8 +96,8 @@ public class TestJobEndNotifier extends JobEndNotifier {
conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_URL, "http://nonexistent"); conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_URL, "http://nonexistent");
conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_MAX_ATTEMPTS, "3"); conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_MAX_ATTEMPTS, "3");
conf.set(MRJobConfig.MR_JOB_END_RETRY_ATTEMPTS, "3"); conf.set(MRJobConfig.MR_JOB_END_RETRY_ATTEMPTS, "3");
conf.set(MRJobConfig.MR_JOB_END_RETRY_INTERVAL, "3"); conf.set(MRJobConfig.MR_JOB_END_RETRY_INTERVAL, "3000");
conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_MAX_RETRY_INTERVAL, "3"); conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_MAX_RETRY_INTERVAL, "3000");
JobReport jobReport = Mockito.mock(JobReport.class); JobReport jobReport = Mockito.mock(JobReport.class);
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestStagingCleanup.java
View File

@ -73,6 +73,7 @@ import org.junit.Test;
JobId jobid = recordFactory.newRecordInstance(JobId.class); JobId jobid = recordFactory.newRecordInstance(JobId.class);
jobid.setAppId(appId); jobid.setAppId(appId);
MRAppMaster appMaster = new TestMRApp(attemptId); MRAppMaster appMaster = new TestMRApp(attemptId);
appMaster.init(conf);
EventHandler<JobFinishEvent> handler = EventHandler<JobFinishEvent> handler =
appMaster.createJobFinishEventHandler(); appMaster.createJobFinishEventHandler();
handler.handle(new JobFinishEvent(jobid)); handler.handle(new JobFinishEvent(jobid));