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

REOPENED - issue BATCH-825: Modify JobLauncher contract to not throw exception on job failure.

Browse Source 
http://jira.springframework.org/browse/BATCH-825

Cleaned up SimpleJob some.  There was still some odd looping behavior, so I abstracted into another inner method.
This commit is contained in:
lucasward
2008-10-08 21:07:32 +00:00
parent 42f392dba6
commit 5cd3887b3a
3 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java
View File

@@ -55,66 +55,33 @@ public class SimpleJob extends AbstractJob {
*/
public void execute(JobExecution execution) {
JobInstance jobInstance = execution.getJobInstance();
StepExecution currentStepExecution = null;
int startedCount = 0;
List<Step> steps = getSteps();
try {
// The job was already stopped before we even got this far. Deal
// with it in the same way as any other interruption.
if (execution.getStatus() == BatchStatus.STOPPING) {
throw new JobInterruptedException("JobExecution already stopped before being executed.");
}
execution.setStartTime(new Date());
updateStatus(execution, BatchStatus.STARTING);
getCompositeListener().beforeJob(execution);
for (Step step : steps) {
if (execution.getStatus() == BatchStatus.STOPPING) {
throw new JobInterruptedException("JobExecution interrupted.");
}
if (shouldStart(jobInstance, step)) {
startedCount++;
updateStatus(execution, BatchStatus.STARTED);
currentStepExecution = execution.createStepExecution(step.getName());
StepExecution lastStepExecution = getJobRepository().getLastStepExecution(jobInstance,
step.getName());
boolean isRestart = (lastStepExecution != null && !lastStepExecution.getStatus().equals(
BatchStatus.COMPLETED)) ? true : false;
if (isRestart) {
currentStepExecution.setExecutionContext(lastStepExecution.getExecutionContext());
}
else {
currentStepExecution.setExecutionContext(new ExecutionContext());
}
step.execute(currentStepExecution);
if (currentStepExecution.getStatus() == BatchStatus.FAILED
|| currentStepExecution.getStatus() == BatchStatus.STOPPED) {
break;
}
if (execution.getStatus() != BatchStatus.STOPPING) {
execution.setStartTime(new Date());
updateStatus(execution, BatchStatus.STARTING);
getCompositeListener().beforeJob(execution);
StepExecution lastStepExecution = handleSteps(steps, execution);
if(lastStepExecution != null){
execution.setStatus(lastStepExecution.getStatus());
execution.setExitStatus(lastStepExecution.getExitStatus());
}
}
// Need to check again for stopped job
if (execution.getStatus() == BatchStatus.STOPPING) {
throw new JobInterruptedException("JobExecution interrupted.");
else{
// The job was already stopped before we even got this far. Deal
// with it in the same way as any other interruption.
execution.setStatus(BatchStatus.STOPPED);
execution.setExitStatus(ExitStatus.FINISHED);
}
updateStatus(execution, currentStepExecution.getStatus());
}
catch (JobInterruptedException e) {
execution.setStatus(BatchStatus.STOPPED);
@@ -125,8 +92,8 @@ public class SimpleJob extends AbstractJob {
execution.addFailureException(t);
}
finally {
ExitStatus status = ExitStatus.FAILED;
if (startedCount == 0) {
if (execution.getStepExecutions().size() == 0) {
ExitStatus status = ExitStatus.FAILED;
if (steps.size() > 0) {
status = ExitStatus.NOOP
.addExitDescription("All steps already completed. No processing was done.");
@@ -134,14 +101,11 @@ public class SimpleJob extends AbstractJob {
else {
status = ExitStatus.NOOP.addExitDescription("No steps configured for this job.");
}
}
else if (currentStepExecution != null) {
status = currentStepExecution.getExitStatus();
execution.setExitStatus(status);
}
execution.setEndTime(new Date());
execution.setExitStatus(status);
getJobRepository().update(execution);
try {
getCompositeListener().afterJob(execution);
@@ -149,6 +113,8 @@ public class SimpleJob extends AbstractJob {
catch (Exception e) {
logger.error("Exception encountered in afterStep callback", e);
}
getJobRepository().update(execution);
}
}
@@ -157,6 +123,51 @@ public class SimpleJob extends AbstractJob {
jobExecution.setStatus(status);
getJobRepository().update(jobExecution);
}
/*
* Private handler of steps. Returns the last StepExecution successfully processed if it exists, null
* if non were processed.
*
*/
private StepExecution handleSteps(List<Step> steps, JobExecution execution) throws JobExecutionException{
JobInstance jobInstance = execution.getJobInstance();
StepExecution currentStepExecution = null;
for (Step step : steps) {
if (execution.getStatus() == BatchStatus.STOPPING) {
throw new JobInterruptedException("JobExecution interrupted.");
}
if (shouldStart(jobInstance, step)) {
updateStatus(execution, BatchStatus.STARTED);
currentStepExecution = execution.createStepExecution(step.getName());
StepExecution lastStepExecution = getJobRepository().getLastStepExecution(jobInstance,
step.getName());
boolean isRestart = (lastStepExecution != null && !lastStepExecution.getStatus().equals(
BatchStatus.COMPLETED)) ? true : false;
if (isRestart) {
currentStepExecution.setExecutionContext(lastStepExecution.getExecutionContext());
}
else {
currentStepExecution.setExecutionContext(new ExecutionContext());
}
step.execute(currentStepExecution);
if (currentStepExecution.getStatus() == BatchStatus.FAILED
|| currentStepExecution.getStatus() == BatchStatus.STOPPED) {
return currentStepExecution;
}
}
}
return currentStepExecution;
}
/*
* Given a step and configuration, return true if the step should start,

2
spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
View File

@@ -231,7 +231,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
exitStatus = exitStatus.and(getCompositeListener().afterStep(stepExecution));
}
catch (Exception e){
logger.error("Excption in afterStep callback", e);
logger.error("Exception in afterStep callback", e);
}
stepExecution.setExitStatus(exitStatus);

1
spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java
View File

@@ -235,6 +235,7 @@ public class SimpleJobTests extends TestCase {
assertEquals(1, jobExecution.getAllFailureExceptions().size());
assertEquals(exception, jobExecution.getAllFailureExceptions().get(0));
assertEquals(0, list.size());
assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
checkRepository(BatchStatus.FAILED, ExitStatus.FAILED);
}