Close channel first before return undeliverable and remove log #1879
Conversation
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
Summary: Two changes: * Close NetTx's `mspc::Receiver` before returning the message. Otherwise, we might get stuck on this loop if there is another thread actively writing to this NetTx: https://www.internalfb.com/code/fbsource/[5ee448cb323e2539ea2cf169644b7d829d715040]/fbcode/monarch/hyperactor/src/channel/net/client.rs?lines=586-590 New messages are still returned after `mspc::Receiver` is closed: https://www.internalfb.com/code/fbsource/[5ee448cb323e2539ea2cf169644b7d829d715040]/fbcode/monarch/hyperactor/src/channel/net.rs?lines=156-161 * Remove the log when the return_channel is closed. This log does not seem to be helpful, and also we do not log it in other places for closed `return_channel`. Differential Revision: D87002126
meta-cla
bot
added
the
CLA Signed
|
This pull request has been merged in adcdb8e. |
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.
Summary:
Two changes:
mspc::Receiverbefore returning the message. Otherwise, we might get stuck on this loop if there is another thread actively writing to this NetTx:https://www.internalfb.com/code/fbsource/[5ee448cb323e2539ea2cf169644b7d829d715040]/fbcode/monarch/hyperactor/src/channel/net/client.rs?lines=586-590
New messages are still returned after
mspc::Receiveris closed:https://www.internalfb.com/code/fbsource/[5ee448cb323e2539ea2cf169644b7d829d715040]/fbcode/monarch/hyperactor/src/channel/net.rs?lines=156-161
return_channel.Differential Revision: D87002126