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

Upgrade job execution status from STOPPING to STOPPED if it has already ended

Browse Source 
Resolves #4064
This commit is contained in:
Marvin Deng
2022-07-06 15:22:46 +08:00
committed by Mahmoud Ben Hassine
parent 84b1e1f702
commit 8a77ca3be3
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2021 the original author or authors.
* Copyright 2006-2022 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.
@@ -172,6 +172,12 @@ public class SimpleJobRepository implements JobRepository {
jobExecution.setLastUpdated(new Date(System.currentTimeMillis()));
jobExecutionDao.synchronizeStatus(jobExecution);
if (jobExecution.getStatus() == BatchStatus.STOPPING && jobExecution.getEndTime() != null) {
if (logger.isInfoEnabled()) {
logger.info("Upgrading job execution status from STOPPING to STOPPED since it has already ended.");
}
jobExecution.upgradeStatus(BatchStatus.STOPPED);
}
jobExecutionDao.updateJobExecution(jobExecution);
}

13
spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2020 the original author or authors.
* Copyright 2006-2022 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.
@@ -295,4 +295,15 @@ public class SimpleJobRepositoryTests {
// Then
assertEquals(expectedResult, actualResult);
}
@Test
public void testUpgradeStopping() {
jobExecution.setStatus(BatchStatus.STOPPING);
jobExecution.setEndTime(new Date());
jobRepository.update(jobExecution);
assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
}
}