Skip to content

Fix SimpleStepExecutionSplitter to restart COMPLETED partitions #5239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KMGeon wants to merge 1 commit into
base: main
Choose a base branch
from
+103 −2
Open

Fix SimpleStepExecutionSplitter to restart COMPLETED partitions #5239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...in/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ public Set<StepExecution> split(StepExecution stepExecution, int gridSize) throw
set.add(currentStepExecution);
}
else { // restart
if (lastStepExecution.getStatus() != BatchStatus.COMPLETED
&& shouldStart(allowStartIfComplete, stepExecution, lastStepExecution)) {
if (shouldStart(allowStartIfComplete, stepExecution, lastStepExecution)) {
StepExecution currentStepExecution = jobRepository.createStepExecution(stepName, jobExecution);
currentStepExecution.setExecutionContext(lastStepExecution.getExecutionContext());
jobRepository.updateExecutionContext(currentStepExecution);
Expand Down
102 changes: 102 additions & 0 deletions ...va/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,108 @@ void testAbandonedStatus() throws Exception {
}
}

@Test
void testCompletedPartitionsSkippedByDefault() throws Exception {
SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step.getName(),
new SimplePartitioner());
Set<StepExecution> split = provider.split(stepExecution, 2);
assertEquals(2, split.size());

stepExecution = update(split, stepExecution, BatchStatus.COMPLETED, false);

Set<StepExecution> restartSplit = provider.split(stepExecution, 2);
assertEquals(0, restartSplit.size());
}

@Test
void testCompletedPartitionsRestartWithAllowStartIfComplete() throws Exception {
SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step.getName(),
new SimplePartitioner());
provider.setAllowStartIfComplete(true);

Set<StepExecution> split = provider.split(stepExecution, 2);
assertEquals(2, split.size());

stepExecution = update(split, stepExecution, BatchStatus.COMPLETED, false);

Set<StepExecution> restartSplit = provider.split(stepExecution, 2);
assertEquals(2, restartSplit.size());
}

@Test
void testCompletedPartitionsRestartInSameJobExecution() throws Exception {
SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step.getName(),
new SimplePartitioner());

Set<StepExecution> split = provider.split(stepExecution, 2);
assertEquals(2, split.size());

stepExecution = update(split, stepExecution, BatchStatus.COMPLETED, true);

Set<StepExecution> restartSplit = provider.split(stepExecution, 2);
assertEquals(2, restartSplit.size());
}

@Test
void testMixedStatusPartitionsRestartWithAllowStartIfComplete() throws Exception {
SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step.getName(),
new SimplePartitioner());
provider.setAllowStartIfComplete(true);

Set<StepExecution> split = provider.split(stepExecution, 2);
assertEquals(2, split.size());

StepExecution restartStepExecution = updateMixedStatus(split, stepExecution);

Set<StepExecution> restartSplit = provider.split(restartStepExecution, 2);
assertEquals(2, restartSplit.size());
}

@Test
void testMixedStatusPartitionsRestartWithoutAllowStartIfComplete() throws Exception {
SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step.getName(),
new SimplePartitioner());
// allowStartIfComplete = false (default)

Set<StepExecution> split = provider.split(stepExecution, 2);
assertEquals(2, split.size());

StepExecution restartStepExecution = updateMixedStatus(split, stepExecution);

// Only FAILED partition should restart, COMPLETED should be skipped
Set<StepExecution> restartSplit = provider.split(restartStepExecution, 2);
assertEquals(1, restartSplit.size());
}

private StepExecution updateMixedStatus(Set<StepExecution> split, StepExecution stepExecution) throws Exception {
boolean first = true;
for (StepExecution child : split) {
child.setEndTime(LocalDateTime.now());
child.setStatus(first ? BatchStatus.COMPLETED : BatchStatus.FAILED);
jobRepository.update(child);
first = false;
}

stepExecution.setEndTime(LocalDateTime.now());
stepExecution.setStatus(BatchStatus.FAILED);
jobRepository.update(stepExecution);

JobExecution jobExecution = stepExecution.getJobExecution();
jobExecution.setStatus(BatchStatus.FAILED);
jobExecution.setEndTime(LocalDateTime.now());
jobRepository.update(jobExecution);

JobInstance jobInstance = jobExecution.getJobInstance();
JobExecution newJobExecution = jobRepository.createJobExecution(jobInstance, jobExecution.getJobParameters(),
jobExecution.getExecutionContext());
StepExecution newStepExecution = jobRepository.createStepExecution(stepExecution.getStepName(),
newJobExecution);
newStepExecution.setExecutionContext(stepExecution.getExecutionContext());
jobRepository.updateExecutionContext(newStepExecution);

return newStepExecution;
}

private StepExecution update(Set<StepExecution> split, StepExecution stepExecution, BatchStatus status)
throws Exception {
return update(split, stepExecution, status, true);
Expand Down