Merge pull request #381 from chengfang/skippable.exception.JBERET-597

JBERET-597 skippable exception thrown in ItemWriter triggers new chun…
jberet · Oct 17, 2023 · 5adcabd · 5adcabd
2 parents 391cb03 + cecb409
commit 5adcabd
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/jberet-core/src/main/java/org/jberet/runtime/runner/ChunkRunner.java b/jberet-core/src/main/java/org/jberet/runtime/runner/ChunkRunner.java
@@ -640,9 +640,13 @@ private void doCheckpoint(final ProcessingInfo processingInfo) throws Exception
                     stepOrPartitionExecution.setReaderCheckpointInfo(itemReader.checkpointInfo());
                     stepOrPartitionExecution.setWriterCheckpointInfo(itemWriter.checkpointInfo());
 
-                    //usually the transaction should not be rolled back upon skippable exception, but if the transaction
-                    //is marked rollback only by other parties, it's no longer usable and so roll it back.
-                    if (tm.getStatus() == Status.STATUS_MARKED_ROLLBACK || tm.getStatus() == Status.STATUS_ROLLEDBACK) {
+                    //If the transaction is marked rollback only by other parties, it's no longer usable so roll it back.
+                    //
+                    //JBERET-597 (skippable exception thrown in ItemWriter triggers new chunk within the old transaction)
+                    //The skippable exception is from ItemWriter so the current chunk will be skipped.
+                    //There is no reason to keep active transactions as they may linger around after this skipped chunk.
+                    if (tm.getStatus() == Status.STATUS_ACTIVE ||
+                            tm.getStatus() == Status.STATUS_MARKED_ROLLBACK || tm.getStatus() == Status.STATUS_ROLLEDBACK) {
                         tm.rollback();
                     }