Embedded: getOption(ChannelOptions.allowRemoteHalfClosure) should not fatalError
#2429
Conversation
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
Lukasa
requested changes
May 17, 2023
Sources/NIOEmbedded/Embedded.swift
Outdated
| internal func getOptionSync<Option: ChannelOption>(_ option: Option) -> Option.Value { | ||
| if option is ChannelOptions.Types.AutoReadOption { | ||
| if option is ChannelOptions.Types.AutoReadOption | ||
| || option is ChannelOptions.Types.AllowRemoteHalfClosureOption { |
Contributor
There was a problem hiding this comment.
I know I gave you this advice, so this is really my fault, but I no longer think this behaviour is quite right. 😁
I think we should allow the user of EmbeddedChannel to have a public var that they can set which provides the value of AllowRemoteHalfClosureOption. That lets tests configure whether the behaviour should be supported or not. This also lets us support setOption for this option.
Relatedly, the default value should be false.
Contributor
Author
There was a problem hiding this comment.
That makes sense 😄! I have pushed the new changes (amended to my old commit)!
felixschlegel
force-pushed
the
fs-embedded-get-option-add-allow-remote-half-closure
branch
from
53ae2d9 to
be337ff
Compare
Lukasa
requested changes
May 19, 2023
Contributor
Lukasa
left a comment
Lukasa
left a comment
There was a problem hiding this comment.
Great, this looks really good. Can I ask you to make the same enhancement to AsyncTestingChannel as well? That will keep the two interfaces in step.
Motivation: In `swift-nio-ssl`, I am currently working on allowing half-closures which relies on querying the underlying channel if `ChannelOptions.Types.AllowRemoteHalfClosureOption` is enabled. As a lot of `swift-nio-ssl`'s tests rely on `EmbeddedChannel` and it did not support this option, a lot of the tests failed. Modifications: * add a `public var allowRemoteHalfClosure` to `EmbeddedChannel` * enable setting/getting `ChannelOptions.Types.AllowRemoteHalfClosureOption` in `EmbeddedChannel` (only modifies the `allowRemoteHalfClosure` variable * add test for new behaviour
Motivation: `AsyncTestingChannel` interface should be in step with `EmbeddedChannel` interface. Therefore also add support for the `AllowRemoteHalfClosureOption` Modifications: * add a `public var allowRemoteHalfClosure` to `AsyncTestingChannel` * enable setting/getting `ChannelOptions.Types.AllowRemoteHalfClosureOption` in `AsyncTestingChannel` (only modifies the `allowRemoteHalfClosure` variable * add tests for new behaviour
felixschlegel
force-pushed
the
fs-embedded-get-option-add-allow-remote-half-closure
branch
from
be337ff to
7560113
Compare
Lukasa
reviewed
May 19, 2023
| public var isActive: Bool { return channelcore.isActive } | ||
|
|
||
| /// - see: `ChannelOptions.Types.AllowRemoteHalfClosureOption` | ||
| public var allowRemoteHalfClosure: Bool = false |
Contributor
There was a problem hiding this comment.
This needs synchronization around it. Can you follow the pattern we used for isActive?
Contributor
Author
There was a problem hiding this comment.
Thanks for pointing that out! Have moved allowRemoteClosure to EmbeddedChannelCore now!
Modifications: * add `ManagedAtomic` property `_allowRemoteHalfClosure` to `EmbeddedChannelCore` * make sure that access to `allowRemoteHalfClosure` from `AsyncTestingChannel` and `EmbeddedChannel` is synchronized by accessing underlying atomic value in `channelcore`
Contributor
|
@swift-server-bot add to allowlist |
Contributor
|
Can you update the allocation limits? |
Lukasa
approved these changes
May 19, 2023
Lukasa
added a commit
to Lukasa/swift-nio-http2
that referenced
this pull request
Jun 23, 2023
Allocations regressed due to our use of EmbeddedChannel, which now uses a new atomic since apple/swift-nio#2429. We can update the limits accordingly.
Lukasa
added a commit
to Lukasa/swift-nio-ssh-1
that referenced
this pull request
Jun 23, 2023
Allocations regressed due to our use of EmbeddedChannel, which now uses a new atomic since apple/swift-nio#2429. We can update the limits accordingly.
Lukasa
added a commit
to apple/swift-nio-ssh
that referenced
this pull request
Jun 23, 2023
Allocations regressed due to our use of EmbeddedChannel, which now uses a new atomic since apple/swift-nio#2429. We can update the limits accordingly.
Lukasa
added a commit
to apple/swift-nio-http2
that referenced
this pull request
Jun 23, 2023
Allocations regressed due to our use of EmbeddedChannel, which now uses a new atomic since apple/swift-nio#2429. We can update the limits accordingly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Motivation
In
swift-nio-ssl, I am currently working on allowing half-closures which rely on querying the underlying channel ifChannelOptions.Types.AllowRemoteHalfClosureOptionis enabled. As a lot ofswift-nio-ssl's tests rely onEmbeddedChannel, which did not support this option, they failed failed due to afatalError.Modifications
public var allowRemoteHalfClosuretoEmbeddedChannelChannelOptions.Types.AllowRemoteHalfClosureOptioninEmbeddedChannel(only modifies theallowRemoteHalfClosurevariable