branch-4.0: [fix](delta writer) Fix shared delta writer state lifetime#64512
Open
bobhan1 wants to merge 1 commit into
Open
branch-4.0: [fix](delta writer) Fix shared delta writer state lifetime#64512bobhan1 wants to merge 1 commit into
bobhan1 wants to merge 1 commit into
Conversation
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
) Issue Number: None Problem Summary: Shared `DeltaWriterV2` instances can be reused by multiple local sinks from the same load. Before this change, the shared writer stored the `RuntimeState*` from the sink that first created it. If that creator sink finished and its `RuntimeState` was destroyed while another local sink continued to reuse the shared writer, `DeltaWriterV2::write()` could access the destroyed state in the memtable flush-limit cancellation path, causing a BE crash or ASAN use-after-free. This PR adds a BE unit test that reproduces the lifetime boundary: - one `VTabletWriterV2` creates the shared `DeltaWriterV2`; - the creator writer and its `RuntimeState` are destroyed without cancelling the shared writer; - a second writer reuses the shared writer and is forced into the `DeltaWriterV2::write()` flush-limit wait path; - the old code reads the destroyed creator state, while the fixed code observes the current writer's cancel state and exits cleanly. The fix removes the stored `RuntimeState*` from `DeltaWriterV2`. The shared writer now keeps only the stable `WorkloadGroup` shared pointer needed by `MemTableWriter` initialization, and `VTabletWriterV2` passes a per-call cancel checker into `DeltaWriterV2::write()` so cancellation is evaluated against the current sink. Fix a possible BE crash when shared delta writers are reused by multiple local sinks.
bobhan1
force-pushed
the
branch-4.0-pick-64349
branch
from
27c5336 to
27cb2ba
Compare
bobhan1
changed the title
Contributor
Author
|
run buildall |
Contributor
BE UT Coverage ReportIncrement line coverage Increment coverage report
|
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
Contributor
Author
|
run nonConcurrent |
Contributor
Author
|
/review |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Automated review result: no blocking issues found.
Critical checkpoints:
- Correctness/lifetime:
DeltaWriterV2no longer retains the creator sinkRuntimeState; current-sink cancellation is checked synchronously during flush-limit waits. Workload-group ownership is preserved through ashared_ptr, and schema/request pointers remain owned by the shared schema object. - Concurrency/cancellation: shared writer map close/cancel paths still use the existing use-counting model, and the new cancel callback is not stored beyond the
write()call. - Profiling/behavior: delta-writer profile collection remains gated by
enable_profile()andprofile_level() >= 2at theVTabletWriterV2::close()call site. - Tests: the new regression test covers reuse of a shared writer after the creator state is destroyed; pool test updates match the constructor signature. Local check run:
git diff --check. - Review focus: no additional user-provided review focus was supplied.
I did not find a critical blocking issue in this PR.
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
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
2 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.
Proposed changes
Backport #64349 to branch-4.0.
This keeps shared
DeltaWriterV2from retaining the creator sink RuntimeState after another local sink reuses the writer. The 4.0 adaptation preserves branch-local paths and keeps delta-writer profile collection gated byenable_profile()andprofile_level() >= 2at theVTabletWriterV2::close()call site.Upstream commit: c33e1b3
Backport commit: 27c5336
Testing
git diff HEAD^ HEAD --check./run-be-ut.sh --run --filter=TestVTabletWriterV2.*:DeltaWriterV2PoolTest.* -j100