time: fix time::advance() with sub-ms durations #3852
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
eb-64-64
reviewed
Jun 11, 2021
Darksonn
reviewed
Jun 11, 2021
|
Does this PR affect #3763? |
It should not. |
Update the advance logic to factor in the timer's ms rounding. Fixes #3837
|
I rebased on 1.6.x so that this can go out as a patch, once it is ready. |
Co-authored-by: sb64 <53383020+sb64@users.noreply.github.com>
|
Pushed a change. Instead of using a sleep in |
Darksonn
reviewed
Jun 14, 2021
Darksonn
reviewed
Jun 14, 2021
|
Applied feedback. |
hawkw
added a commit
to linkerd/linkerd2-proxy
that referenced
this pull request
Jun 16, 2021
These don't actually *need* to advance the mock clock --- they are just intended to make the current task yield so the background task can observe updates. Replacing them with `yield_now` expresses intent more accurately. Also, this seems to fix the test failing after upgrading to tokio 1.6.2+, presumably related to tokio-rs/tokio#3852. I'm still trying to figure out _why_ exactly this fixes the test (and why it breaks in the first place), but at least this PR will get CI passing on Tokio 1.7.0. See here for details: #1079 (comment)
olix0r
pushed a commit
to linkerd/linkerd2-proxy
that referenced
this pull request
Jun 16, 2021
These don't actually *need* to advance the mock clock --- they are just intended to make the current task yield so the background task can observe updates. Replacing them with `yield_now` expresses intent more accurately. Also, this seems to fix the test failing after upgrading to tokio 1.6.2+, presumably related to tokio-rs/tokio#3852. I'm still trying to figure out _why_ exactly this fixes the test (and why it breaks in the first place), but at least this PR will get CI passing on Tokio 1.7.0. See here for details: #1079 (comment)
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.
Update the advance logic to factor in the timer's ms rounding.
Fixes #3837