Revert delayed dispatch handling to the connections. #9051 #12077

gregw · 2024-07-23T06:56:29Z

Fix #9051. Revert to delayed content handling in the Connections

gregw · 2024-07-23T06:58:21Z

@sbordet @lorban Your thoughts on doing this? If you think it is a good idea, can you contribute the h2 and h3 delayed dispatch handling to this branch.
I will then change the DelayedHandler to only be for delaying to read the entire content (buffering to disk or parsing multi-part or form content).

lorban · 2024-07-23T09:49:21Z

Implementation-wise, this looks alright assuming the same logic can be replicated in H2/H3 (but I doubt this is going to be troublesome).

But could you summarize what benefits/drawbacks this has over the existing DelayedHandler both for clarity and posterity?

gregw · 2024-07-23T14:50:54Z

@lorban wrote:

could you summarize what benefits/drawbacks this has over the existing DelayedHandler both for clarity and posterity?

The DelayedHandler is not able to truly delay the dispatch to the next handler without an execute. This is because, unlike the handle call, the demand callback is serialized with other demand/write callbacks. So if a demand callback is used to call the next handler handle method, it can dead lock if blocks waiting on a demand/write callback. Thus we need to dispatch, which kind of defeats the whole purpose of avoiding scheduling delays on the initial dispatch without content.

gregw · 2024-07-26T22:19:46Z

@sbordet @lorban Can you take this one on

gregw · 2024-08-06T07:15:24Z

I've also taken the opportunity to cleanup lots of deprecation and TODOs in HttpConnection

gregw · 2024-08-07T01:59:38Z

@lachlan-roberts Can you take over the handling of delayed multipart in this PR?

…tty-12.1.x/delayedDispatch

Signed-off-by: Lachlan Roberts <[email protected]>

…ispatch' into experiment/jetty-12.1.x/delayedDispatch

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DelayedHandler.java

gregw · 2024-08-23T01:58:38Z

@sbordet can you do the h2 handling for this
@lorban can you do the h3 handling for this

…tty-12.1.x/delayedDispatch # Conflicts: # jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java # jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/AbstractTest.java # jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java # jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/ServletTest.java # jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletTest.java

gregw · 2024-09-15T23:26:11Z

@sbordet can you do the h2 handling for this
@lorban can you do the h3 handling for this

sbordet · 2024-09-17T08:58:25Z

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java

@@ -52,12 +52,9 @@ protected AbstractConnection(EndPoint endPoint, Executor executor)
        _readCallback = new ReadCallback();
    }

-    @Deprecated


Please restore this, as it is fixed in #12266.

sbordet · 2024-09-17T08:58:43Z

jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java

-        // TODO consider removing the #fillInterested method from the connection and only use #fillInterestedCallback
-        //      so a connection need not be Invocable


Please restore.

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java

sbordet · 2024-09-17T09:14:28Z

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DelayedHandler.java

+import org.eclipse.jetty.http.MultiPartConfig;
+import org.eclipse.jetty.http.MultiPartFormData;


If we restore delayed dispatch, I am not sure this Handler is necessary anymore.

My point being that we have one-liner helpers that do exactly the same without the need to have a Handler in the Handler chain.

For example, an application can call FormFields.from() as a one liner to do the same job.
We offer no synchronous API to get the Fields, so an application would always have to deal with a CompletableFuture<Fields>, so the DelayedHandler seems not that useful anymore.

@sbordet We do offer synchronous APIs. The Servlet API is mostly blocking and is implemented on top of FormFields and MultiPart. The idea of the handler is that it can be put in front of an application that is written with blocking APIs (e.g. any multipart servlet). The handler would then asynchronously receive the content before propagating the handle call, allowing the blocking code to execute without blocking.

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java

sbordet · 2024-09-17T09:28:31Z

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java

            return true;
        }

        @Override
        public boolean contentComplete()
        {
-            // Do nothing at this point.
+            // Do nothing at this point unless we delayed for content


Suggested change

// Do nothing at this point unless we delayed for content

// Do nothing at this point unless we delayed for content.

Not on this line, but the _delayedForContent logic has not been ported to earlyEOF() nor for idle timeouts like it was in Jetty 11.

sbordet · 2024-09-17T09:35:07Z

jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletTest.java

@@ -138,6 +139,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
        }, "/post");

        _connector.setIdleTimeout(idleTimeout);
+        _connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setDelayDispatchUntilContent(false);


sbordet · 2024-09-17T09:35:28Z

jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/ServletTest.java

@@ -141,6 +142,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
        }, "/post");

        _connector.setIdleTimeout(idleTimeout);
+        _connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setDelayDispatchUntilContent(false);


sbordet · 2024-09-17T09:35:45Z

jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletTest.java

@@ -133,6 +134,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
        }), "/post");

        _connector.setIdleTimeout(idleTimeout);
+        _connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration().setDelayDispatchUntilContent(false);


@sbordet Good question... I can't remember exactly. With this line the test passes, but does log a "channel already completed" exception. Without this line the test fails with NPE exception and 500 response. Neither is good.... investigating...

@sbordet @lorban So I've worked out why I did this.... These tests behave differently with deferred dispatch because we have refined the idle/failure handling without considering delayed dispatch and we act differently if there is pending demand from the application or not.

Without delayed dispatch, we call the app, which tries to read, so we have an _onContentAvailable runnable to call and feed it an error chunk.
With delayed content, we have not called the app, so there is no content runnable, so we don't set an error chunk with the idle timeout, Thus the error that is seen is a failure to consume all content, which is a bit strange.

I'm thinking that what we should do is half the idletimeout when we delay dispatch, then when the idle timeout goes off, we do the dispatch anyway and let the other half of the idle timeout playout. That way we get identical behaviour with and without delayed dispatch.

Thoughts?

PS. I think we probably should walk through the idle timeout stuff again at some stage, as consumeAvailable gets called 2 or 3 times at the moment!

lorban · 2024-09-17T10:11:50Z

@gregw I'm going to take care of both H2 and H3 as they're going to be very similar.

Remove delayed dispatch, but keep other improvements

Revert delayed dispatch handling to the connections.

5d1a9f6

gregw requested review from lorban, sbordet and lachlan-roberts July 23, 2024 06:56

Revert delayed dispatch handling to the connections.

8c07278

gregw assigned sbordet and lorban Jul 26, 2024

Cleanup of HttpConnection

548770c

Delay until MultiPartFormData

ec0d325

gregw assigned lachlan-roberts Aug 7, 2024

gregw and others added 6 commits August 7, 2024 12:38

Merge remote-tracking branch 'origin/jetty-12.1.x' into experiment/je…

fb85057

…tty-12.1.x/delayedDispatch

Wait for release

da5f09f

fixed removal of deprecated methods

5993364

fixed no mimeType

3ef3d6e

PR #12077 - add test for DelayedHandler with multipart

5ede88a

Signed-off-by: Lachlan Roberts <[email protected]>

Merge remote-tracking branch 'origin/experiment/jetty-12.1.x/delayedD…

e8ab483

…ispatch' into experiment/jetty-12.1.x/delayedDispatch

lachlan-roberts requested changes Aug 8, 2024

View reviewed changes

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java Outdated Show resolved Hide resolved

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DelayedHandler.java Show resolved Hide resolved

gregw added 2 commits August 22, 2024 16:24

updates from review

9e1f431

fixed test

e0f5b7e

gregw requested a review from lachlan-roberts August 23, 2024 01:57

sbordet requested changes Sep 17, 2024

View reviewed changes

gregw added 6 commits September 18, 2024 08:43

WIP updates from review

d4dcd6a

WIP updates from review

9eb9e7d

WIP updates from review

72ab339

WIP updates from review

e45ecad

Merge branch 'jetty-12.1.x' into experiment/jetty-12.1.x/delayedDispatch

cac0d62

WIP updates from review

a585cfc

Remove delayed dispatch, but keep other improvements

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert delayed dispatch handling to the connections. #9051 #12077

Revert delayed dispatch handling to the connections. #9051 #12077

gregw commented Jul 23, 2024

gregw commented Jul 23, 2024

lorban commented Jul 23, 2024

gregw commented Jul 23, 2024 •

edited

Loading

gregw commented Jul 26, 2024

gregw commented Aug 6, 2024

gregw commented Aug 7, 2024

gregw commented Aug 23, 2024

gregw commented Sep 15, 2024

sbordet Sep 17, 2024

sbordet Sep 17, 2024

sbordet Sep 17, 2024

gregw Sep 17, 2024

sbordet Sep 17, 2024

sbordet Sep 17, 2024

sbordet Sep 17, 2024

sbordet Sep 17, 2024

gregw Sep 17, 2024

gregw Sep 18, 2024

lorban commented Sep 17, 2024

		// TODO consider removing the #fillInterested method from the connection and only use #fillInterestedCallback
		// so a connection need not be Invocable

		import org.eclipse.jetty.http.MultiPartConfig;
		import org.eclipse.jetty.http.MultiPartFormData;

	// Do nothing at this point unless we delayed for content
	// Do nothing at this point unless we delayed for content.

Revert delayed dispatch handling to the connections. #9051 #12077

Are you sure you want to change the base?

Revert delayed dispatch handling to the connections. #9051 #12077

Conversation

gregw commented Jul 23, 2024

gregw commented Jul 23, 2024

lorban commented Jul 23, 2024

gregw commented Jul 23, 2024 • edited Loading

gregw commented Jul 26, 2024

gregw commented Aug 6, 2024

gregw commented Aug 7, 2024

gregw commented Aug 23, 2024

gregw commented Sep 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lorban commented Sep 17, 2024

gregw commented Jul 23, 2024 •

edited

Loading