branch-4.1: [fix](load)fix VNodeChannel close_wait hang#65241
Open
liaoxin01 wants to merge 1 commit into
Open
Conversation
During streamload execution, close_wait waits for either add_batches_finished or cancel. When writing to a single replica, encountering a slave node=nullptr condition causes an early return. If no RPC callback is set and no cancel occurs at this point, close_wait becomes deadlock.
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR backports a fix to prevent stream load from hanging in close_wait() when VNodeChannel::try_send_pending_block() hits certain early-return error paths (e.g., missing slave node or DNS resolve failure), and adds a regression test to catch the hang.
Changes:
- Add a regression test that enables a BE debug point to simulate “slave node not found” and ensures the load does not hang.
- In
VNodeChannel::try_send_pending_block(), callcancel()and_send_block_callback->clear_in_flight()before returning when a slave node is missing. - Also
cancel()(and clear in-flight) when hostname-to-IP resolution fails for the BRPC HTTP path.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 6 comments.
| File | Description |
|---|---|
| regression-test/suites/load_p0/test_stream_load_close_wait_hang.groovy | New regression to detect stream-load close_wait() hang under a debug-injected error path. |
| be/src/exec/sink/writer/vtablet_writer.cpp | Fixes early-return paths to cancel and clear in-flight RPC state to avoid hangs; adds a debug point for reproduction. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
|
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
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.
Pick #58024