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

Fix job execution validation in SimpleJobRepository

Browse Source 
Before this commit, the logic that validates if a job
instance is complete or not was based only on the size
of previous parameters, without checking if they are
identifying or not.

This commit introduces a change that uses only
identifying job parameters to identify a job instance
and validate its previous executions.

Issue #1221
This commit is contained in:
Mahmoud Ben Hassine
2021-05-05 16:20:28 +02:00
parent c4b001b732
commit 7f0824b9da
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2020 the original author or authors.
* Copyright 2006-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameter;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
@@ -132,7 +133,9 @@ public class SimpleJobRepository implements JobRepository {
+ "The last execution ended with a failure that could not be rolled back, "
+ "so it may be dangerous to proceed. Manual intervention is probably necessary.");
}
if (execution.getJobParameters().getParameters().size() > 0 && (status == BatchStatus.COMPLETED || status == BatchStatus.ABANDONED)) {
Collection<JobParameter> allJobParameters = execution.getJobParameters().getParameters().values();
long identifyingJobParametersCount = allJobParameters.stream().filter(JobParameter::isIdentifying).count();
if (identifyingJobParametersCount > 0 && (status == BatchStatus.COMPLETED || status == BatchStatus.ABANDONED)) {
throw new JobInstanceAlreadyCompleteException(
"A job instance already exists and is complete for parameters=" + jobParameters
+ ". If you want to run this job again, change the parameters.");

22
spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2018 the original author or authors.
* Copyright 2008-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@ import static org.junit.Assert.fail;
*
* @author Robert Kasanicky
* @author Dimitrios Liapis
* @author Mahmoud Ben Hassine
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "/org/springframework/batch/core/repository/dao/sql-dao-test.xml")
@@ -212,4 +213,23 @@ public class SimpleJobRepositoryIntegrationTests {
assertEquals(stepExecution, jobExecution.getStepExecutions().iterator().next());
}
/*
* Create two job executions for the same job+parameters tuple. Should ignore
* non-identifying job parameters when identifying the job instance.
*/
@Transactional
@Test
public void testReExecuteWithSameJobParameters() throws Exception {
JobParameters jobParameters = new JobParametersBuilder()
.addString("name", "foo", false)
.toJobParameters();
JobExecution jobExecution1 = jobRepository.createJobExecution(job.getName(), jobParameters);
jobExecution1.setStatus(BatchStatus.COMPLETED);
jobExecution1.setEndTime(new Date());
jobRepository.update(jobExecution1);
JobExecution jobExecution2 = jobRepository.createJobExecution(job.getName(), jobParameters);
assertNotNull(jobExecution1);
assertNotNull(jobExecution2);
}
}