shim: move event context timeout to publsher#4412
Merged
fuweid merged 1 commit intocontainerd:masterfrom Jul 22, 2020
Merged
Conversation
Member
Author
|
I have a test for this, but since the old behavior is racey it is difficult to make the test fail with the old code without arbitrary sleeps. |
|
Build succeeded.
|
dmcgowan
reviewed
Jul 21, 2020
Member
There was a problem hiding this comment.
The ctx isn't used in between here and next Forward, this could avoid the defer by just calling cancel after.
Before this change, if an event fails to send on the first attempt, subsequent attempts will fail with context.Cancelled because the the caller of publish passes a cancellable timeout, which the publisher uses to send the event. The publisher returns immediately if the send fails, but adds the event to an async queue to try again. Meanwhile the caller will return cancelling the context. Additionally, subsequent attempts may fail to send because the timeout was expected to be for a single request but the queue sleeps for `attempt*time.Second`. In the shim service, the timeout was set to 5s, which means the send will fail with context.DeadlineExceeded before it reaches `maxRequeue` (which is currently 5). This change moves the timeout to the publisher so each send attempt gets its own timeout. Signed-off-by: Brian Goff <[email protected]>
cpuguy83
force-pushed
the
shim2_event_cancelled
branch
from
ac78efc to
d7b9cb0
Compare
|
Build succeeded.
|
Member
|
LGTM |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Before this change, if an event fails to send on the first attempt,
subsequent attempts will fail with context.Cancelled because the the
caller of publish passes a cancellable timeout, which the publisher uses
to send the event.
The publisher returns immediately if the send fails, but adds the event
to an async queue to try again.
Meanwhile the caller will return cancelling the context.
Additionally, subsequent attempts may fail to send because the timeout
was expected to be for a single request but the queue sleeps for
attempt*time.Second.In the shim service, the timeout was set to 5s, which means the send
will fail with context.DeadlineExceeded before it reaches
maxRequeue(which is currently 5).
This change moves the timeout to the publisher so each send attempt gets
its own timeout.
Fixes #4400