Add test for job restart after recovering from abrupt shutdown

Related to #4943

Author: fmbenhassine

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MongoDBJobRestartIntegrationTests.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Collections;
 
 import com.mongodb.client.MongoCollection;
 import org.bson.Document;
@@ -25,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
+import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.JobExecution;
@@ -42,7 +44,11 @@
 import org.springframework.core.io.Resource;
 import org.springframework.data.mongodb.MongoTransactionManager;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.util.Assert;
 
 /**
  * @author Mahmoud Ben Hassine
@@ -56,6 +62,11 @@ public class MongoDBJobRestartIntegrationTests {
 
 	@BeforeEach
 	public void setUp() throws IOException {
+		// TODO put drop statements in schema-drop-mongodb.jsonl
+		mongoTemplate.dropCollection("BATCH_JOB_INSTANCE");
+		mongoTemplate.dropCollection("BATCH_JOB_EXECUTION");
+		mongoTemplate.dropCollection("BATCH_STEP_EXECUTION");
+		mongoTemplate.dropCollection("BATCH_SEQUENCES");
 		Resource resource = new FileSystemResource(
 				"src/main/resources/org/springframework/batch/core/schema-mongodb.jsonl");
 		Files.lines(resource.getFilePath()).forEach(line -> mongoTemplate.executeCommand(line));
@@ -109,4 +120,54 @@ void testJobExecutionRestart(@Autowired JobOperator jobOperator, @Autowired JobR
 		Assertions.assertEquals(3, lastStepExecution.getId());
 	}
 
+	/*
+	 * Test for https://github.com/spring-projects/spring-batch/issues/4943: after abrupt
+	 * shutdown, the embedded job.execution.stepExecutions array is not synchronized, but
+	 * BATCH_STEP_EXECUTION collection still contains the data.
+	 */
+	@Test
+	void testRestartAfterRecoverFromAbruptShutdown(@Autowired JobOperator jobOperator,
+			@Autowired JobRepository jobRepository, @Autowired Job job) throws Exception {
+		// Step 1: Run job normally
+		JobParameters jobParameters = new JobParametersBuilder().addString("name", "foo").toJobParameters();
+
+		JobExecution jobExecution = jobOperator.start(job, jobParameters);
+
+		// Verify job completed successfully
+		Assertions.assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+
+		// Step 2: Simulate the core issue:
+		// - set job execution status to STARTED
+		// - clear embedded stepExecutions array while keeping BATCH_STEP_EXECUTION
+		// collection intact
+
+		jobExecution.setStatus(BatchStatus.STARTED);
+		jobRepository.update(jobExecution);
+
+		Query jobQuery = new Query(Criteria.where("jobExecutionId").is(jobExecution.getId()));
+		Update jobUpdateStepExecutions = new Update().set("stepExecutions", Collections.emptyList());
+		mongoTemplate.updateFirst(jobQuery, jobUpdateStepExecutions, "BATCH_JOB_EXECUTION");
+
+		// Step 3: Verify that job's status = STARTED and embedded array is empty but
+		// collection still has data
+		MongoCollection<Document> jobExecutionsCollection = mongoTemplate.getCollection("BATCH_JOB_EXECUTION");
+		MongoCollection<Document> stepExecutionsCollection = mongoTemplate.getCollection("BATCH_STEP_EXECUTION");
+
+		Document document = jobExecutionsCollection.find(new Document("jobExecutionId", jobExecution.getId())).first();
+		Assertions.assertTrue(document.getString("status").equals("STARTED"), "job must be in STARTED status");
+		Assertions.assertTrue(document.getList("stepExecutions", Document.class).isEmpty(),
+				"Embedded stepExecutions array should be empty");
+		Assertions.assertEquals(2, stepExecutionsCollection.countDocuments(),
+				"BATCH_STEP_EXECUTION collection should still contain data");
+
+		// Step 4: recover the job execution
+		JobExecution recoveredJobExecution = jobOperator.recover(jobExecution);
+		Assert.notNull(recoveredJobExecution.getExecutionContext().get("recovered"),
+				"Job execution should be marked as recovered");
+
+		// Step 5: restart the job
+		JobExecution restartedJobExecution = jobOperator.restart(recoveredJobExecution);
+		Assertions.assertEquals(BatchStatus.COMPLETED, restartedJobExecution.getStatus());
+	}
+
 }