session: unblock a cancelled stdin write when the kill fails - #113
Open
team-humaki wants to merge 1 commit into
Open
team-humaki wants to merge 1 commit into
team-humaki wants to merge 1 commit into
Conversation
Closing the output reader only ends the read phase. A command still blocked in writeCommand held the session lock, so Close could not close stdin either. Cut stdin in cancelNow (and in Close, before the lock) so a failed kill still returns. Fixes Daily-AC#112
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
1 participant
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.
A cancel that cannot kill the process group already cuts the output reader so the read phase returns. The submit phase was still stuck:
writeCommandholds the session lock while blocked on a full stdin pipe, andClosewaited for that lock before closing stdin.cancelNow(andClose) now close stdin without taking the lock, so a blocked write returns. The kill error is still attached toErrSessionCancelled.Fixes #112