Skip to content

Fix #5340: Allow restart of jobs with JobParameterIncrementer from command line #5353

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

Fix #5340: Allow restart of jobs with JobParameterIncrementer from command line #5353

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
25 changes: 18 additions & 7 deletions ...h-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,10 @@ public Long start(String jobName, Properties parameters)

/**
* Start a new instance of a job with the specified parameters. If the job defines a
* {@link JobParametersIncrementer}, then the incrementer will be used to calculate
* the next parameters in the sequence and the provided parameters will be ignored.
* {@link JobParametersIncrementer} and there is no restartable job instance for the
* provided parameters, then the incrementer will be used to calculate the next
* parameters in the sequence. Otherwise, the job will be launched (or restarted) with
* the provided parameters.
* @param job the {@link Job} to start
* @param jobParameters the {@link JobParameters} to start the job with
* @return the {@link JobExecution} that was started
Expand All @@ -191,12 +193,21 @@ public JobExecution start(Job job, JobParameters jobParameters) throws JobInstan
Assert.notNull(job, "The Job must not be null.");
Assert.notNull(jobParameters, "The JobParameters must not be null.");
if (job.getJobParametersIncrementer() != null) {
if (!jobParameters.isEmpty() && logger.isWarnEnabled()) {
logger.warn(String.format(
"Attempting to launch job: [%s] which defines an incrementer with additional parameters: [%s]. Additional parameters will be ignored.",
job.getName(), jobParameters));
// First, try to run the job with the provided parameters.
// This will restart failed/stopped job instances if they exist.
try {
return run(job, jobParameters);
}
catch (JobInstanceAlreadyCompleteException e) {
// Job instance with these parameters is already complete.
// Use the incrementer to get the next parameters for a new instance.
if (!jobParameters.isEmpty() && logger.isWarnEnabled()) {
logger.warn(String.format(
"Job instance for [%s] with parameters [%s] is already complete. Using incrementer to get next parameters.",
job.getName(), jobParameters));
}
return startNextInstance(job);
}
return startNextInstance(job);
}
return run(job, jobParameters);
}
Expand Down