Skip to content

branch-4.1: [fix](load)fix VNodeChannel close_wait hang - #65241

Merged
yiguolei merged 1 commit into
apache:branch-4.1from
liaoxin01:codex/pick-58024-to-branch-4.1
Jul 7, 2026
Merged

branch-4.1: [fix](load)fix VNodeChannel close_wait hang#65241
yiguolei merged 1 commit into
apache:branch-4.1from
liaoxin01:codex/pick-58024-to-branch-4.1

Conversation

@liaoxin01

@liaoxin01liaoxin01 commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Pick #58024

@koarz@liaoxin01
[fix](load)fix VNodeChannel close_wait hang (apache#58024)
518afca
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.
CopilotAI review requested due to automatic review settings July 6, 2026 06:35
@liaoxin01
liaoxin01 requested a review from yiguolei as a code ownerJuly 6, 2026 06:35
@hello-stephen

hello-stephen commented Jul 6, 2026

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?

CopilotAI reviewed Jul 6, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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(), call cancel() 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.

FileDescription
regression-test/suites/load_p0/test_stream_load_close_wait_hang.groovyNew regression to detect stream-load close_wait() hang under a debug-injected error path.
be/src/exec/sink/writer/vtablet_writer.cppFixes 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.

Comment threadregression-test/suites/load_p0/test_stream_load_close_wait_hang.groovy
Comment threadregression-test/suites/load_p0/test_stream_load_close_wait_hang.groovy
Comment threadregression-test/suites/load_p0/test_stream_load_close_wait_hang.groovy
Comment threadregression-test/suites/load_p0/test_stream_load_close_wait_hang.groovy
Comment threadbe/src/exec/sink/writer/vtablet_writer.cpp
Comment threadbe/src/exec/sink/writer/vtablet_writer.cpp
@liaoxin01

liaoxin01 commented Jul 6, 2026

Copy link
Copy Markdown
ContributorAuthor

run buildall

@hello-stephen

hello-stephen commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

BE UT Coverage Report

Increment line coverage 0.00% (0/10) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage54.78% (20953/38250)
Line Coverage38.21% (199958/523330)
Region Coverage34.65% (156870/452668)
Branch Coverage35.63% (68524/192337)

@hello-stephen

hello-stephen commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

BE Regression && UT Coverage Report

Increment line coverage 0.00% (0/10) 🎉

Increment coverage report
Complete coverage report

CategoryCoverage
Function Coverage72.05% (26928/37373)
Line Coverage55.13% (287157/520829)
Region Coverage52.62% (239821/455763)
Branch Coverage53.72% (103487/192633)

@yiguolei

yiguolei commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

skip buildall

@github-actions

github-actionsBot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot added approved Indicates a PR has been approved by one committer. reviewed labels Jul 7, 2026
@github-actions

github-actionsBot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

PR approved by anyone and no changes requested.

@yiguolei
yiguolei merged commit 444e4cc into apache:branch-4.1Jul 7, 2026
34 of 37 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Lite
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@yiguoleiyiguoleiyiguolei approved these changes

Assignees

No one assigned

Labels

approvedIndicates a PR has been approved by one committer.reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@liaoxin01@hello-stephen@yiguolei@koarz