RUST-360 Guard connection establishment by connectTimeoutMS #743
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
patrickfreed
commented
Sep 15, 2022
| @@ -198,16 +197,6 @@ impl Monitor { | |||
| // Otherwise, just use connectTimeoutMS. | |||
| self.connect_timeout() | |||
| }; | |||
| let timeout_future = async { | |||
There was a problem hiding this comment.
This was moved into the runtime module.
patrickfreed
requested review from
a team and
abr-egn
and removed request for
a team
abr-egn
approved these changes
Sep 16, 2022
src/cmap/establish/mod.rs
Outdated
| @@ -59,14 +65,29 @@ impl ConnectionEstablisher { | |||
| None | |||
| }; | |||
|
|
|||
| let connect_timeout = if let Some(timeout) = options.connect_timeout { | |||
There was a problem hiding this comment.
Nit: I think this might be easier to read as a match against Some(0), Some(n), and None.
There was a problem hiding this comment.
Good idea, done. I had to do it a little bit different since we're matching on a Duration, but I still think it's more readable than before.
kmahar
approved these changes
Sep 16, 2022
isabelatkinson
approved these changes
Sep 16, 2022
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.
In #721, I moved around a lot of the logic for enforcing
connectTimeoutMSand inadvertently removed it from the operation connection establishment code path. This PR adds it back in.