big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-6826. Job fails with InvalidStateTransitonException: Invalid event: JOB_TASK_COMPLETED at SUCCEEDED/COMMITTING. Contributed by Bilwa S T.

Browse Source 
(cherry picked from commit d4e36409d4)
This commit is contained in:
Surendra Singh Lilhore 2020-05-19 11:06:36 +05:30 committed by Brahma Reddy Battula
parent ae2d856515
commit c70f5eb8fa
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
View File

@ -422,7 +422,8 @@ JobEventType.JOB_KILL, new KillTasksTransition())
EnumSet.of(JobEventType.JOB_UPDATED_NODES, EnumSet.of(JobEventType.JOB_UPDATED_NODES,
JobEventType.JOB_TASK_ATTEMPT_FETCH_FAILURE, JobEventType.JOB_TASK_ATTEMPT_FETCH_FAILURE,
JobEventType.JOB_TASK_ATTEMPT_COMPLETED, JobEventType.JOB_TASK_ATTEMPT_COMPLETED,
JobEventType.JOB_MAP_TASK_RESCHEDULED)) JobEventType.JOB_MAP_TASK_RESCHEDULED,
JobEventType.JOB_TASK_COMPLETED))
// Transitions from SUCCEEDED state // Transitions from SUCCEEDED state
.addTransition(JobStateInternal.SUCCEEDED, JobStateInternal.SUCCEEDED, .addTransition(JobStateInternal.SUCCEEDED, JobStateInternal.SUCCEEDED,
@ -441,7 +442,8 @@ JobEventType.JOB_KILL, new KillTasksTransition())
JobEventType.JOB_TASK_ATTEMPT_FETCH_FAILURE, JobEventType.JOB_TASK_ATTEMPT_FETCH_FAILURE,
JobEventType.JOB_AM_REBOOT, JobEventType.JOB_AM_REBOOT,
JobEventType.JOB_TASK_ATTEMPT_COMPLETED, JobEventType.JOB_TASK_ATTEMPT_COMPLETED,
JobEventType.JOB_MAP_TASK_RESCHEDULED)) JobEventType.JOB_MAP_TASK_RESCHEDULED,
JobEventType.JOB_TASK_COMPLETED))
// Transitions from FAIL_WAIT state // Transitions from FAIL_WAIT state
.addTransition(JobStateInternal.FAIL_WAIT, .addTransition(JobStateInternal.FAIL_WAIT,

12
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java
View File

@ -204,7 +204,7 @@ public void testCommitJobFailsJob() throws Exception {
public void testCheckJobCompleteSuccess() throws Exception { public void testCheckJobCompleteSuccess() throws Exception {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
conf.set(MRJobConfig.MR_AM_STAGING_DIR, stagingDir); conf.set(MRJobConfig.MR_AM_STAGING_DIR, stagingDir);
AsyncDispatcher dispatcher = new AsyncDispatcher(); DrainDispatcher dispatcher = new DrainDispatcher();
dispatcher.init(conf); dispatcher.init(conf);
dispatcher.start(); dispatcher.start();
CyclicBarrier syncBarrier = new CyclicBarrier(2); CyclicBarrier syncBarrier = new CyclicBarrier(2);
@ -226,6 +226,11 @@ public void testCheckJobCompleteSuccess() throws Exception {
JobEventType.JOB_MAP_TASK_RESCHEDULED)); JobEventType.JOB_MAP_TASK_RESCHEDULED));
assertJobState(job, JobStateInternal.COMMITTING); assertJobState(job, JobStateInternal.COMMITTING);
job.handle(new JobEvent(job.getID(),
JobEventType.JOB_TASK_COMPLETED));
dispatcher.await();
assertJobState(job, JobStateInternal.COMMITTING);
// let the committer complete and verify the job succeeds // let the committer complete and verify the job succeeds
syncBarrier.await(); syncBarrier.await();
assertJobState(job, JobStateInternal.SUCCEEDED); assertJobState(job, JobStateInternal.SUCCEEDED);
@ -238,6 +243,11 @@ public void testCheckJobCompleteSuccess() throws Exception {
JobEventType.JOB_MAP_TASK_RESCHEDULED)); JobEventType.JOB_MAP_TASK_RESCHEDULED));
assertJobState(job, JobStateInternal.SUCCEEDED); assertJobState(job, JobStateInternal.SUCCEEDED);
job.handle(new JobEvent(job.getID(),
JobEventType.JOB_TASK_COMPLETED));
dispatcher.await();
assertJobState(job, JobStateInternal.SUCCEEDED);
dispatcher.stop(); dispatcher.stop();
commitHandler.stop(); commitHandler.stop();
} }