Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

client: fix canceled vs deadline exceeded double-check logic #2906

Merged
merged 2 commits into from
Jul 16, 2019

Conversation

dfawley
Copy link
Member

@dfawley dfawley commented Jul 15, 2019

@dfawley dfawley added this to the 1.23 Release milestone Jul 15, 2019
@dfawley dfawley requested a review from menghanl July 15, 2019 17:26
// Our deadline was already exceeded, and that was likely the cause of
// this cancelation. Alter the status code accordingly.
if d, ok := s.ctx.Deadline(); ok && d.After(time.Now()) {
if d, ok := s.ctx.Deadline(); ok && d.Before(time.Now()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want to include if d == now.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the current time is the same as the deadline, was the deadline "exceeded"?

I don't think this will matter much either way. Done.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deadline - now() = timeout. So any timer created is triggering when deadline == now (but yes, it may be delayed). Yes, that matters a lot less than the general fix here.

@dfawley dfawley merged commit 64ddb19 into grpc:master Jul 16, 2019
@dfawley dfawley deleted the time_after_time branch July 16, 2019 16:41
dfawley added a commit to dfawley/grpc-go that referenced this pull request Jul 19, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Jan 12, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants