Skip to content

branch-4.1: [fix](be) Protect tablet writer map lookup in load channel #64604 - #64752

Merged
yiguolei merged 1 commit into
branch-4.1from
auto-pick-64604-branch-4.1
Jun 24, 2026
Merged

branch-4.1: [fix](be) Protect tablet writer map lookup in load channel #64604#64752
yiguolei merged 1 commit into
branch-4.1from
auto-pick-64604-branch-4.1

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Cherry-picked from #64604

### What problem does this PR solve?
Issue Number: None
Related PR: #57133
Problem Summary:
`BaseTabletsChannel::_write_block_data` can run concurrently with
`incremental_open` for the same tablets channel. `_tablet_writers` is an
`std::unordered_map` protected by `_tablet_writers_lock` when writers
are inserted, but the tablet load rowset info lookup read the map
without holding the lock.
A concurrent `emplace` may rehash `_tablet_writers`, so the unlocked
lookup can race with bucket reallocation. This patch protects the lookup
with `_tablet_writers_lock` and avoids using unordered_map iterators
after the lock is released. The actual writer operations still run
outside `_tablet_writers_lock`, so the lock remains scoped to the map
access.
@github-actions
github-actionsBot requested a review from yiguolei as a code ownerJune 23, 2026 13:53
@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?

@hello-stephen

Copy link
Copy Markdown
Contributor

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

BE UT Coverage Report

Increment line coverage 0.00% (0/15) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage54.00% (20571/38091)
Line Coverage37.60% (195771/520702)
Region Coverage33.97% (153061/450580)
Branch Coverage34.91% (66768/191265)

@hello-stephen

Copy link
Copy Markdown
Contributor

BE Regression && UT Coverage Report

Increment line coverage 86.67% (13/15) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage73.62% (27403/37222)
Line Coverage57.25% (296667/518199)
Region Coverage54.92% (249164/453685)
Branch Coverage56.29% (107828/191559)

@yiguolei

Copy link
Copy Markdown
Contributor

skip buildall

@github-actions

Copy link
Copy Markdown
ContributorAuthor

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

@github-actionsgithub-actionsBot added the approved Indicates a PR has been approved by one committer. label Jun 24, 2026
@github-actions

Copy link
Copy Markdown
ContributorAuthor

PR approved by anyone and no changes requested.

@yiguolei
yiguolei merged commit a4baa4a into branch-4.1Jun 24, 2026
32 of 34 checks passed
@morningman
morningman deleted the auto-pick-64604-branch-4.1 branch July 8, 2026 14:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approvedIndicates a PR has been approved by one committer.reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@hello-stephen@yiguolei@0AyanamiRei