Jetty 9.4.x 4331 async close complete3 #4409
Merged
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
Added test harness to reproduce unready completing write. Fixed test by not closing output prior to becoming READY Signed-off-by: Greg Wilkins <[email protected]>
Test harness to reproduce unready when closing/completing. Signed-off-by: Greg Wilkins <[email protected]>
test both PENDING and UNREADY Signed-off-by: Greg Wilkins <[email protected]>
test cleanups Signed-off-by: Greg Wilkins <[email protected]>
Cleanups of write Signed-off-by: Greg Wilkins <[email protected]>
…31-asyncCloseComplete2
Signed-off-by: Greg Wilkins <[email protected]>
Work in progress Signed-off-by: Greg Wilkins <[email protected]>
Added async close to HttpWriter and ResponseWriter Always use async close, with blocker if necessary. Signed-off-by: Greg Wilkins <[email protected]>
Working async close complete! Signed-off-by: Greg Wilkins <[email protected]>
invert test as we can now call complete when not ready! Signed-off-by: Greg Wilkins <[email protected]>
fixed transition to ERROR state Signed-off-by: Greg Wilkins <[email protected]>
async close after onError Signed-off-by: Greg Wilkins <[email protected]>
minor cleanups Signed-off-by: Greg Wilkins <[email protected]>
Fix for proxy tests Signed-off-by: Greg Wilkins <[email protected]>
Fix write loop to handle clear of p=0,l=0 rather than p=l Signed-off-by: Greg Wilkins <[email protected]>
Removed old close on all content mechanism Cleanups and some more TODOs Signed-off-by: Greg Wilkins <[email protected]>
a reworking of HttpOutput to separate out API state. Signed-off-by: Greg Wilkins <[email protected]>
Soft close for Dispatcher release buffer in onWriteComplete Signed-off-by: Greg Wilkins <[email protected]>
Set _onError in onWriteComplete NOOP callback instead of null Signed-off-by: Greg Wilkins <[email protected]>
failure closes HttpOutput Signed-off-by: Greg Wilkins <[email protected]>
Moved closedCallback handling to onWriteComplete Signed-off-by: Greg Wilkins <[email protected]>
Additional test of complete during blocking write. Signed-off-by: Greg Wilkins <[email protected]>
reimplemented blocking close to sometimes be async Signed-off-by: Greg Wilkins <[email protected]>
ascii "art" Signed-off-by: Greg Wilkins <[email protected]>
Code cleanup. Use a CLOSE state rather than non null closedCallback to be clearer that it is a state. Renamed close(Callback) to complete(Callback) Renamed and simplified closed() to completed() Signed-off-by: Greg Wilkins <[email protected]>
Do not dispatch Better ascii art improved close impl to be similar to complete Signed-off-by: Greg Wilkins <[email protected]>
More test cases Signed-off-by: Greg Wilkins <[email protected]>
retain execute behaviour in 9.4. review in 10. Signed-off-by: Greg Wilkins <[email protected]>
|
@lachlan-roberts @sbordet This is ready for proper review. Would be good to get a green tick early Monday so we can start a release cycle. |
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
Outdated
Show resolved
Hide resolved
Switch to CLOSING state as soon as last write is done, even if several non last channelWrites will be done. This allows a subsequent call to close to know that nothing needs to be written and can avoid some EOF exceptions. Now onWriteComplete acts only on the passed in last parameter. Added test for sendContent
|
@sbordet @lachlan-roberts I'm am getting the failure in the attached log very occassionally... only one one laptop... only once in about 1000 runs... but sometimes 10 times in a row!!! |
|
@sbordet @lachlan-roberts I think I found the problem... I was calling the closedCallback and then releasing the buffer. I've inverted that order and now it does not fail. |
Signed-off-by: Greg Wilkins <[email protected]>
Better javadoc refactored onWriteComplete logic to be simpler fixed bug with flush of last written byte Signed-off-by: Greg Wilkins <[email protected]>
Completely reworked test harness for better coverage. Signed-off-by: Greg Wilkins <[email protected]>
|
92% code coverage of HttpOutput with current tests |
|
@sbordet review please |
…31-asyncCloseComplete3
Reworked order of ifs to match logic above in onWriteComplete Signed-off-by: Greg Wilkins <[email protected]>
sbordet
approved these changes
Dec 18, 2019
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 replaces #4398 as a fix for #4331
This PR breaks out the HttpOutput state into api state and close state.