Skip to content

branch-4.1: [fix](streaming-job) Fix NPE in StreamingInsertJob.replayOnCommitted during EditLog replay #62416#62516

Merged
yiguolei merged 1 commit intobranch-4.1from
auto-pick-62416-branch-4.1
Apr 16, 2026
Merged

branch-4.1: [fix](streaming-job) Fix NPE in StreamingInsertJob.replayOnCommitted during EditLog replay #62416#62516
yiguolei merged 1 commit intobranch-4.1from
auto-pick-62416-branch-4.1

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Cherry-picked from #62416

…during EditLog replay (#62416)

### What problem does this PR solve?

Problem Summary:

Fix NPE in `StreamingInsertJob.replayOnCommitted()` during FE checkpoint
EditLog replay.

When a streaming insert task is canceled while its transaction is being
committed, `beforeCommitted()` silently returned without setting
`txnCommitAttachment`. The transaction still committed with a null
attachment written to EditLog. During checkpoint replay,
`replayOnCommitted()` calls
`Preconditions.checkNotNull(txnState.getTxnCommitAttachment())`,
throwing NPE.

Two issues fixed in `beforeCommitted()`:
1. Throw `TransactionException` when task is canceled instead of silent
`return`, preventing commit with null attachment. Consistent with
`RoutineLoadJob.executeBeforeCheck()` pattern.
2. Fix write lock leak — replaced broken `shouldReleaseLock` (always
`false`) with `passCheck` pattern: release lock on failure in `finally`,
keep it for `onStreamTaskSuccess/Fail()` to release on success.
@github-actions github-actions Bot requested a review from yiguolei as a code owner April 15, 2026 06:33
@hello-stephen
Copy link
Copy Markdown
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@dataroaring dataroaring reopened this Apr 15, 2026
@hello-stephen
Copy link
Copy Markdown
Contributor

run buildall

@hello-stephen
Copy link
Copy Markdown
Contributor

FE UT Coverage Report

Increment line coverage 0.00% (0/6) 🎉
Increment coverage report
Complete coverage report

@hello-stephen
Copy link
Copy Markdown
Contributor

FE Regression Coverage Report

Increment line coverage 33.33% (2/6) 🎉
Increment coverage report
Complete coverage report

@github-actions github-actions Bot added the approved Indicates a PR has been approved by one committer. label Apr 15, 2026
@github-actions
Copy link
Copy Markdown
Contributor Author

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Copy Markdown
Contributor Author

PR approved by anyone and no changes requested.

@yiguolei yiguolei closed this Apr 16, 2026
@yiguolei yiguolei reopened this Apr 16, 2026
@yiguolei yiguolei merged commit 19bba18 into branch-4.1 Apr 16, 2026
43 of 47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants