Skip to content

Improve JobRepositoryTestUtils to mitigate OptimisticLockingFailureException while removing JobExecution #5173

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
quaff wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −2
Open

Improve JobRepositoryTestUtils to mitigate OptimisticLockingFailureException while removing JobExecution #5173

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
8 changes: 6 additions & 2 deletions spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,11 @@ public void removeJobExecutions(Collection<JobExecution> jobExecutions) {
* @param jobExecution the {@link JobExecution} to delete
*/
public void removeJobExecution(JobExecution jobExecution) {
this.jobRepository.deleteJobExecution(jobExecution);
// query latest version of JobExecution to avoid OptimisticLockingFailureException
jobExecution = this.jobRepository.getJobExecution(jobExecution.getId());
if (jobExecution != null) {
this.jobRepository.deleteJobExecution(jobExecution);
}
}

/**
Expand All @@ -165,7 +169,7 @@ public void removeJobExecutions() {
List<JobInstance> jobInstances = this.jobRepository.findJobInstances(jobName);
for (JobInstance jobInstance : jobInstances) {
List<JobExecution> jobExecutions = this.jobRepository.getJobExecutions(jobInstance);
if (jobExecutions != null && !jobExecutions.isEmpty()) {
if (!jobExecutions.isEmpty()) {
removeJobExecutions(jobExecutions);
}
}
Expand Down
30 changes: 30 additions & 0 deletions ...-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
/**
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @author Yanming Zhou
*
*/
@SpringJUnitConfig(locations = "/simple-job-launcher-context.xml")
Expand Down Expand Up @@ -139,4 +140,33 @@ void testRemoveJobExecutions() throws Exception {
assertEquals(0, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));
}

@Test
void testRemoveJobExecution() throws Exception {
// given
utils = new JobRepositoryTestUtils(jobRepository);
JobExecution jobExecution = utils.createJobExecutions(1).get(0);
assertEquals(1, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));
assertEquals(1, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STEP_EXECUTION"));

// when
jobExecution.setVersion(-1); // simulate stale version
utils.removeJobExecution(jobExecution);

// then
assertEquals(0, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STEP_EXECUTION"));
assertEquals(0, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));

List<JobExecution> jobExecutions = utils.createJobExecutions("test", new String[] { "step1", "step2" }, 2);
assertEquals(2, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));
assertEquals(4, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STEP_EXECUTION"));

// when
jobExecutions.forEach(je -> je.setVersion(-1)); // simulate stale version
utils.removeJobExecutions(jobExecutions);

// then
assertEquals(0, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STEP_EXECUTION"));
assertEquals(0, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_JOB_EXECUTION"));
}

}