fixes bug with incorrect WS framesize setup. #610
Merged
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
This PR provides a websocket transport's frame size setup with regards of current RSocket fragment size. Current implementation provides the following setup rules: * if `mtu` is 0 (means no fragmentation) - then WS frame size is equal to maximum default frame size of RSocket frame which is `16_777_215`; * if `mtu` is GT > 0 and LT < 65536 (default for WS frame size) then the WS frame size will be its the default one (which is `65536`); * if `mtu` is GT > 65536 then the WS frame size will be set to the specified by that parameter size Signed-off-by: Oleh Dokuka <[email protected]>
OlegDokuka
commented
Apr 1, 2019
| }) | ||
| .bind() | ||
| .map(CloseableChannel::new); | ||
| } | ||
|
|
||
| static final class UriPathTemplate { |
There was a problem hiding this comment.
This is port from Reactor-Netty internals
cc/
@violetagg
OlegDokuka
commented
Apr 1, 2019
Signed-off-by: Oleh Dokuka <[email protected]>
yschimke
reviewed
Apr 1, 2019
...transport-netty/src/main/java/io/rsocket/transport/netty/server/WebsocketRouteTransport.java
Outdated
Show resolved
Hide resolved
robertroeser
reviewed
Apr 1, 2019
| @@ -114,6 +118,8 @@ public void setTransportHeaders(Supplier<Map<String, String>> transportHeaders) | |||
| (request, response) -> { | |||
| transportHeaders.get().forEach(response::addHeader); | |||
| return response.sendWebsocket( | |||
| null, | |||
| Math.max(DEFAULT_FRAME_SIZE, mtu == 0 ? FRAME_MAX_SIZE : mtu), | |||
There was a problem hiding this comment.
what is this doing? Is there a reason we are setting the max frame size to anything but rsocket max frame size?
There was a problem hiding this comment.
So, the entire fragmentation logic is built on top of the assumption that mtu is higher than 0. So if mtu is 0, then fragmentation is avoided. It means that max size of the fragment should be less || equal to maximum possible size frame. At least I was thinking like that when writing that code. In case 0xFFFFFF is a specific limit to fragmentation and in general payload size is unlimited (or limited to (Integer.MAX_VALUE - 2)), then I can fix that.
There was a problem hiding this comment.
simplified to max frame size for all possible cases
Signed-off-by: Oleh Dokuka <[email protected]>
Signed-off-by: Oleh Dokuka <[email protected]>
Signed-off-by: Oleh Dokuka <[email protected]>
mostroverkhov
pushed a commit
that referenced
this pull request
Apr 5, 2019
* fixes buf with incorrect WS framesize setup. This PR provides a websocket transport's frame size setup with regards of current RSocket fragment size. Current implementation provides the following setup rules: * if `mtu` is 0 (means no fragmentation) - then WS frame size is equal to maximum default frame size of RSocket frame which is `16_777_215`; * if `mtu` is GT > 0 and LT < 65536 (default for WS frame size) then the WS frame size will be its the default one (which is `65536`); * if `mtu` is GT > 65536 then the WS frame size will be set to the specified by that parameter size Signed-off-by: Oleh Dokuka <[email protected]> * rollbacks commented docs build * fixes format Signed-off-by: Oleh Dokuka <[email protected]> * cleanup pollution uses max frame size from `FrameLengthFlyweight` Signed-off-by: Oleh Dokuka <[email protected]> * simplifies logic of max frame size setup for ws transport Signed-off-by: Oleh Dokuka <[email protected]> * fixes google java format Signed-off-by: Oleh Dokuka <[email protected]> Signed-off-by: Maksym Ostroverkhov <[email protected]>
OlegDokuka
added a commit
that referenced
this pull request
May 29, 2019
Signed-off-by: Oleh Dokuka <[email protected]>
robertroeser
pushed a commit
that referenced
this pull request
Jun 6, 2019
* backports fixes bug with incorrect WS framesize setup (#614) * rollback mockito version * changed timeout * changed timeout * small fix * replace with concurrent maps Signed-off-by: Oleh Dokuka <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR provides a WebSocket transport's frame size setup with regards
of current RSocket fragment size.
Signed-off-by: Oleh Dokuka [email protected]