Skip to content

cancel should be done with outbound user event #110

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

Merged
merged 3 commits into from
Sep 23, 2019
Merged

Conversation

artemredkin
Copy link
Collaborator

fixes #97

@artemredkin artemredkin requested a review from weissi September 23, 2019 14:53
@@ -476,7 +476,7 @@ extension HTTPClient {
self.lock.withLock {
if !cancelled {
cancelled = true
channel?.pipeline.fireUserInboundEventTriggered(TaskCancelEvent())
channel?.triggerUserOutboundEvent(TaskCancelEvent(), promise: nil)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think since cancellation is not guaranteed to do anything (it's best effort only), we can skip any errors, wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

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

@artemredkin firing through the ChannelPipeline should come out of the lock. So something like

let channel = self.lock.withLock {
    if !self.cancelled {
        self.cancelled = true
        return self.channel
    }
 }
channel?.triggerUserOutboundEvent(...)

Regarding ignoring the promise: I'm okay with that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

fixed, thanks!

Copy link
Contributor

@weissi weissi left a comment

Choose a reason for hiding this comment

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

sorry, missed the more important bit first :)

}
channel?.triggerUserOutboundEvent(TaskCancelEvent(), promise: nil)
Copy link
Contributor

Choose a reason for hiding this comment

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

@artemredkin I'm pretty sure this doesn't actually work (which proves there's no test) because whatever ChannelHandler is supposed to catch this event needs to change from inbound to outbound user event.

Copy link
Contributor

Choose a reason for hiding this comment

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

we need to add a test that verifies cancellation works.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

we definitely have the test, it just never finishes :D

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

fixed! and tests pass now

Copy link
Contributor

@weissi weissi left a comment

Choose a reason for hiding this comment

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

Awesome, thank you!

@weissi weissi merged commit 54b0b96 into master Sep 23, 2019
@weissi weissi deleted the cancel_with_outbound branch September 23, 2019 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cancel should be done with an outbound user event
2 participants