Fix buffer leak in HttpClientStreamTest.testUploadWithConcurrentServerCloseClosesStream()
#10431
Conversation
This file contains 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
joakime
previously approved these changes
Aug 29, 2023
|
This requires more investigations as stopping the connector should release any pending buffer not yet handed over to user code. |
lorban
force-pushed
the
fix/jetty-12-10226-testUploadWithConcurrentServerCloseClosesStream
branch
from
36be6fc
to
56dbe8a
Compare
lorban
force-pushed
the
fix/jetty-12-10226-testUploadWithConcurrentServerCloseClosesStream
branch
from
5bf4077
to
d3de838
Compare
gregw
previously approved these changes
Sep 8, 2023
|
@sbordet nudge |
sbordet
requested changes
Sep 8, 2023
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Ludovic Orban <[email protected]>
…onClose() Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
lorban
force-pushed
the
fix/jetty-12-10226-testUploadWithConcurrentServerCloseClosesStream
branch
2 times, most recently
from
fb96bb9
to
e290596
Compare
Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
lorban
force-pushed
the
fix/jetty-12-10226-testUploadWithConcurrentServerCloseClosesStream
branch
from
e290596
to
dd3d6d7
Compare
Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
lorban
force-pushed
the
fix/jetty-12-10226-testUploadWithConcurrentServerCloseClosesStream
branch
from
dd3d6d7
to
c4f4446
Compare
|
On hold until #10277 is sorted. |
|
The problem is that stopping the connector is notifying the HttpConnection via onClose, but that notification isn't reported to the channel state. The tentative fix of releasing the buffer in onClose and ensuring the buffer only gets released once by making it atomic isn't right as HttpConnection's buffer shouldn't need any thread safety. |
|
@sbordet nudge |
Signed-off-by: Ludovic Orban <[email protected]>
…10226-testUploadWithConcurrentServerCloseClosesStream
Signed-off-by: Ludovic Orban <[email protected]>
sbordet
requested changes
Apr 8, 2024
...y-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java
Outdated
Show resolved
Hide resolved
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
Outdated
Show resolved
Hide resolved
…10226-testUploadWithConcurrentServerCloseClosesStream
Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
joakime
previously approved these changes
Apr 11, 2024
sbordet
requested changes
Apr 16, 2024
...t-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientStreamTest.java
Show resolved
Hide resolved
Signed-off-by: Ludovic Orban <[email protected]>
joakime
previously approved these changes
Apr 17, 2024
gregw
requested changes
Apr 18, 2024
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
Outdated
Show resolved
Hide resolved
...y-fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
Signed-off-by: Ludovic Orban <[email protected]>
sbordet
approved these changes
Apr 19, 2024
gregw
approved these changes
Apr 22, 2024
| LOG.debug("onClose {} stream={}", this, _stream); | ||
|
|
||
| // If the channel doesn't have a stream, then no action is needed. | ||
| if (_stream == null) |
There was a problem hiding this comment.
would _request == null be a better test. Do we want an EofException if a connection is opened then closed without a request?
There was a problem hiding this comment.
I used the _stream == null test for consistency with onFailure() that tests for that too, but in practice it's identical to _request == null as both are reset to null at the same place in recycle().
And I do believe it is correct to fail with a EofException when a connection is opened then immediately closed without sending a byte.
@sbordet Do you agree?
lorban
deleted the
fix/jetty-12-10226-testUploadWithConcurrentServerCloseClosesStream
branch
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.
Depends on #10432 - so this PR is a branch of that other PR.
See #10226