Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addressed stopped jobs from a job step

Browse Source 
Prior to this commit, when using the `JobStep`, if the child job was
stopped (left in the `STOPPED` state), the step executing that job was
marked as `COMPLETE`, preventing it from being restarted.  This commit
now marks a step that was executing the stopped job also as stopped,
allowing for it to be restarted.

Resolves BATCH-2429
This commit is contained in:
Michael Minella
2016-10-14 12:07:48 -05:00
parent cfad543a63
commit ca847e2760
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-batch-core/src/test/java/org/springframework/batch/core/step/job/JobStepTests.java
View File

@@ -15,8 +15,11 @@
*/
package org.springframework.batch.core.step.job;
import java.util.Date;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
@@ -28,8 +31,6 @@ import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
import org.springframework.batch.item.ExecutionContext;
import java.util.Date;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -171,4 +172,35 @@ public class JobStepTests {
}
@Test
public void testStoppedChild() throws Exception {
DefaultJobParametersExtractor jobParametersExtractor = new DefaultJobParametersExtractor();
jobParametersExtractor.setKeys(new String[] {"foo"});
ExecutionContext executionContext = stepExecution.getExecutionContext();
executionContext.put("foo", "bar");
step.setJobParametersExtractor(jobParametersExtractor);
step.setJob(new JobSupport("child") {
@Override
public void execute(JobExecution execution) {
assertEquals(1, execution.getJobParameters().getParameters().size());
execution.setStatus(BatchStatus.STOPPED);
execution.setEndTime(new Date());
jobRepository.update(execution);
}
@Override
public boolean isRestartable() {
return true;
}
});
step.afterPropertiesSet();
step.execute(stepExecution);
JobExecution jobExecution = stepExecution.getJobExecution();
jobExecution.setEndTime(new Date());
jobRepository.update(jobExecution);
assertEquals(BatchStatus.STOPPED, stepExecution.getStatus());
}
}