Skip to content

Fix skip policy with JPA ItemWriter in scan mode #5379

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

Closed
MinChul-Son wants to merge 2 commits into from
Closed

Fix skip policy with JPA ItemWriter in scan mode #5379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d23215
Fix skip policy with JPA ItemWriter in scan mode
MinChul-Son Apr 15, 2026
2ea4fff
Add tests for skip policy with JPA-like rollback-only behavior
MinChul-Son Apr 15, 2026
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
58 changes: 42 additions & 16 deletions ...-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
* @author Mahmoud Ben Hassine
* @author Andrey Litvitski
* @author xeounxzxu
* @author Minchul Son
* @since 6.0
*/
public class ChunkOrientedStep<I, O> extends AbstractStep {
Expand Down Expand Up @@ -375,6 +376,11 @@ protected void doExecute(StepExecution stepExecution) throws Exception {

// Skip update during rollback to avoid OptimisticLockingFailureException
if (transactionStatus.isRollbackOnly()) {
// Explicitly mark as locally rollback-only to prevent
// UnexpectedRollbackException when the transaction manager
// (eg JpaTransactionManager) has marked it as globally rollback-only
// (eg after a JPA flush failure) but not locally rollback-only.
transactionStatus.setRollbackOnly();
chunkTransactionEvent.transactionStatus = BatchMetrics.STATUS_ROLLED_BACK;
chunkTransactionEvent.commit();
return;
Expand Down Expand Up @@ -408,17 +414,26 @@ private void processChunkConcurrently(TransactionStatus status, StepContribution
try {
if (tracker.isScanMode()) {
logger.info("Executing scan in new transaction after rollback");
Chunk<O> pendingChunk = tracker.getPendingChunk();
if (pendingChunk != null) {
O item = tracker.pollNextScanItem();
if (item != null) {
Chunk<O> singleItemChunk = new Chunk<>(item);
ChunkScanEvent chunkScanEvent = new ChunkScanEvent(stepExecution.getStepName(),
stepExecution.getId());
chunkScanEvent.begin();
scan(pendingChunk, contribution);
compositeChunkListener.beforeChunk(singleItemChunk);
scan(singleItemChunk, contribution);
if (!status.isRollbackOnly()) {
compositeChunkListener.afterChunk(singleItemChunk);
}
chunkScanEvent.skipCount = contribution.getSkipCount();
chunkScanEvent.commit();
}
if (!tracker.hasPendingScanItems()) {
logger.info("Chunk scan completed");
tracker.exitScanMode();
stepExecution.incrementCommitCount();
if (!status.isRollbackOnly()) {
stepExecution.incrementCommitCount();
}
}
return;
}
Expand Down Expand Up @@ -486,19 +501,26 @@ private void processChunkSequentially(TransactionStatus status, StepContribution
try {
if (tracker.isScanMode()) {
logger.info("Executing scan in new transaction after rollback");
Chunk<O> pendingChunk = tracker.getPendingChunk();
if (pendingChunk != null) {
O item = tracker.pollNextScanItem();
if (item != null) {
Chunk<O> singleItemChunk = new Chunk<>(item);
ChunkScanEvent chunkScanEvent = new ChunkScanEvent(stepExecution.getStepName(),
stepExecution.getId());
chunkScanEvent.begin();
compositeChunkListener.beforeChunk(new Chunk<>());
scan(pendingChunk, contribution);
compositeChunkListener.afterChunk(pendingChunk);
compositeChunkListener.beforeChunk(singleItemChunk);
scan(singleItemChunk, contribution);
if (!status.isRollbackOnly()) {
compositeChunkListener.afterChunk(singleItemChunk);
}
chunkScanEvent.skipCount = contribution.getSkipCount();
chunkScanEvent.commit();
}
if (!tracker.hasPendingScanItems()) {
logger.info("Chunk scan completed");
tracker.exitScanMode();
stepExecution.incrementCommitCount();
if (!status.isRollbackOnly()) {
stepExecution.incrementCommitCount();
}
}
return;
}
Expand Down Expand Up @@ -838,12 +860,12 @@ static <T> ChunkTracker<T> create() {

private boolean scanMode;

@Nullable private Chunk<O> pendingChunk;
@Nullable private LinkedList<O> pendingScanItems;

void init() {
this.moreItems = true;
this.scanMode = false;
this.pendingChunk = null;
this.pendingScanItems = null;
}

void reset() {
Expand All @@ -856,20 +878,24 @@ boolean moreItems() {

void enterScanMode(Chunk<O> chunk) {
this.scanMode = true;
this.pendingChunk = new Chunk<>(chunk.getItems());
this.pendingScanItems = new LinkedList<>(chunk.getItems());
}

boolean isScanMode() {
return this.scanMode;
}

@Nullable Chunk<O> getPendingChunk() {
return this.pendingChunk;
@Nullable O pollNextScanItem() {
return (this.pendingScanItems != null) ? this.pendingScanItems.poll() : null;
}

boolean hasPendingScanItems() {
return this.pendingScanItems != null && !this.pendingScanItems.isEmpty();
}

void exitScanMode() {
this.scanMode = false;
this.pendingChunk = null;
this.pendingScanItems = null;
}

}
Expand Down
Loading