zhttpsocket: proper handling of is_writable #47882
Merged
Conversation
This file contains 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
jkarneges
force-pushed
the
jkarneges/handle-send-fix
branch
from
a6752e0 to
9b86fdb
Compare
sima-fastly
reviewed
Jan 23, 2024
| @@ -292,11 +297,15 @@ impl SessionData { | |||
| } | |||
| } | |||
|
|
|||
| fn add(&self, key: SessionKey, handle_index: usize) -> Result<Session, ()> { | |||
| fn add(&self, key: SessionKey, handle_index: usize) -> Result<Session, SessionAddError> { | |||
| let inner = &mut *self.inner.lock().unwrap(); | |||
There was a problem hiding this comment.
mutex handling can be improved improved by handling the potential error that can occur when locking the mutex, instead of using unwrap()
There was a problem hiding this comment.
lock() fails if the mutex is poisoned, which means we have a logic error and so it's reasonable to abort the program on the spot
sima-fastly
reviewed
Jan 23, 2024
sima-fastly
reviewed
Jan 23, 2024
| match ret { | ||
| Ok(()) => {} | ||
| Err(StreamHandlesSendError::BadFormat) => warn!("stream send_any: bad format"), | ||
| Err(StreamHandlesSendError::NoneReady) => *next_msg = Some(msg), |
There was a problem hiding this comment.
is this *next_msg = Some(msg) for retry purposes?
sima-fastly
reviewed
Jan 23, 2024
this is another case where an error would be a logic error, hence the comment, and panicking is thus preferred |
sima-fastly
approved these changes
Jan 23, 2024
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.
AsyncSender::is_writableandwait_writableindicate if/when the channel might be writable, but they do not guarantee the channel is actually writable. This means ifwait_writable().awaitis followed by a non-blocking send, the possibility of the send failing must still be handled. This change ensures failed sends are reattempted when writability is indicated again.This change also corrects
check_send_anyto wait for at least one handle to be writable instead of waiting for all to be writable, and it clarifies the various sending error scenarios.