fix(net): drain satellite out_buffer in Sink::poll_ready to prevent starvation#23358
Open
0xMars42 wants to merge 1 commit intoparadigmxyz:mainfrom
Open
fix(net): drain satellite out_buffer in Sink::poll_ready to prevent starvation#233580xMars42 wants to merge 1 commit intoparadigmxyz:mainfrom
0xMars42 wants to merge 1 commit intoparadigmxyz:mainfrom
Conversation
6a5607d to
35570e2
Compare
35570e2 to
6c81f21
Compare
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.
Closes #13856
Drains
out_bufferinRlpxSatelliteStream'sSink::poll_readybefore reporting readiness, so that buffered satellite messages are flushed to the wire before new primary messages are accepted.Previously,
out_bufferwas only drained insideStream::poll_next. TheSink::poll_readychecked connection and primary readiness but never touchedout_buffer, meaning callers could continuously send primary messages via the sink path while satellite messages sat in the buffer waiting for the stream to be polled.The drain logic checks
conn.poll_readybefore popping from the buffer to avoid losing messages if the connection returnsPending. The existingpoll_readycall onconnafter the drain loop was removed sinceconnis already known to beReady(Ok(()))from the last drain iteration.