fix: avoid data branch merge channel race - #24583
Merged
mergify[bot] merged 3 commits intoMay 26, 2026
Merged
Conversation
Capture the result channel before launching the data branch output goroutine so later cleanup cannot nil the channel seen by the consumer. Fixes matrixorigin#24568 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
XuPeng-SH
approved these changes
May 26, 2026
XuPeng-SH
left a comment
XuPeng-SH
left a comment
Contributor
There was a problem hiding this comment.
Reviewed the current head 0d4a025 from multiple angles. The fix is correct on main as well: the output goroutine now captures the result channel before launch, so later cleanup setting retBatCh = nil cannot make the consumer range over a nil channel and hang. I also checked the surrounding producer/consumer flow in diffMergeAgency, newEmitter, satisfyDiffOutputOpt, pickMergeDiffs, and mergeDiffs; I did not find a remaining blocking issue in the current patch.
Contributor
Merge Queue Status
This pull request spent 48 minutes 9 seconds in the queue, including 47 minutes 30 seconds running CI. Waiting for
All conditions
ReasonThe merge conditions cannot be satisfied due to failing checks Failing checks: HintYou may have to fix your CI before adding the pull request to the queue again. |
Contributor
Merge Queue Status
This pull request spent 8 hours 56 minutes 49 seconds in the queue, including 5 hours 6 minutes 27 seconds running CI. Required conditions to merge
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
Which issue(s) does this PR fix or relate to?
Fixes #24568
What this PR does / why we need it:
Test