Skip to content

branch-4.1: [improvement](catalog) narrow MaterializedIndex addTablet sync scope #64478#64859

Merged
yiguolei merged 1 commit into
branch-4.1from
auto-pick-64478-branch-4.1
Jun 29, 2026
Merged

branch-4.1: [improvement](catalog) narrow MaterializedIndex addTablet sync scope #64478#64859
yiguolei merged 1 commit into
branch-4.1from
auto-pick-64478-branch-4.1

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Cherry-picked from #64478

…64478)

Move the synchronized modifier from the public addTablet / appendTablets
methods onto appendTabletsInternal, the only block that actually mutates
the per-index list and idToTablets map.

The TabletInvertedIndex.addTablet(...) call in the non-restore path of
addTablet does not need to share this lock — it has its own internal
synchronization and operates on a separate object. Holding the per-index
monitor across that call only serialized unrelated writers without
guarding any shared state on this index.

Readers see the new tablets via the same volatile publish in
appendTabletsInternal as before, so the existing TOCTOU window between
the per-index snapshot and TabletInvertedIndex (handled by the
IllegalStateException catch in TabletStatMgr.updateTabletStat) is
unchanged in both width and shape.

### What problem does this PR solve?

Issue Number: close #xxx

Related PR: #63298

Problem Summary:

### Release note

None

### Check List (For Author)

- Test <!-- At least one of them must be included. -->
    - [ ] Regression test
    - [ ] Unit Test
    - [ ] Manual test (add detailed scripts or steps below)
    - [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
        - [ ] Previous test can cover this change.
        - [ ] No code files have been changed.
        - [ ] Other reason <!-- Add your reason?  -->

- Behavior changed:
    - [ ] No.
    - [ ] Yes. <!-- Explain the behavior change -->

- Does this need documentation?
    - [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->

### Check List (For Reviewer who merge this PR)

- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
@github-actions
github-actions Bot requested a review from yiguolei as a code owner June 25, 2026 12:18
@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

FE Regression Coverage Report

Increment line coverage 100% (0/0) 🎉
Increment coverage report
Complete coverage report

@yx-keith

Copy link
Copy Markdown
Contributor

run feut

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants