Fixes to ConnectionLimit for use with WebSocket #13350
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
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Closed
sbordet
previously requested changes
Jul 14, 2025
...-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketConnectionLimitTest.java
Outdated
Show resolved
Hide resolved
...-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketConnectionLimitTest.java
Outdated
Show resolved
Hide resolved
...jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/WebSocketOverHTTP2Test.java
Outdated
Show resolved
Hide resolved
...jetty-tests/src/test/java/org/eclipse/jetty/ee10/websocket/tests/WebSocketOverHTTP2Test.java
Outdated
Show resolved
Hide resolved
gregw
requested changes
Jul 15, 2025
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onClosed(Connection connection) | ||
| public void onClosed(SelectableChannel channel) |
There was a problem hiding this comment.
I was expecting this class to change to having two limits:
- Channel limit: onAccepting, onAccepted - > onClosed(SelectableChannel)
- Connection limit: onOpened(Connection) -> onClosed(Connection)
At the very least, the javadoc needs to be changed to explain that it is Channels that are being limited, not connections. If we leave it as just that, then perhaps the class name needs to be changed as well?
If the class limits both, then its name can stay the same, but more javadoc is needed.
Alternately, we have both ChannelLimit and ConnectionLimit listeners?
|
From conversation on weekly call... Deprecate |
|
Create another class to limit virtual connections (channels)... Maybe in a different PR |
|
I'm working on this. |
* Deprecated ConnectionLimit and associated Jetty module, and removed their usages in favor of EndPointLimit. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
gregw
previously approved these changes
Jul 22, 2025
…nLimit in a test. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
sbordet
approved these changes
Jul 28, 2025
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.
Issue #13324
Change
ConnectionLimitclass to operate exclusively on TCP connections by adding aonClosednotification to theAcceptListenerclass.This will make it work with
WebSocketwhere theHttpConnectionis closed and replaced with aWebSocketConnection.When upgrading to WebSocket over HTTP/2 the
ConnectionLimitwill only apply to the singleHTTP2Connection, and not to the multipleWebSocketConnections which can be created over streams on this connection.