#11932 make succeeded and failed in ICB final + introduce onSuccess

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Jun 24, 2024 · ebdee1b · ebdee1b
1 parent 865b726
commit ebdee1b
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 78 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -414,8 +414,6 @@ jetty-10.0.18 - 26 October 2023
  + 10537 HTTP/3: Incomplete Data Transfer When Used with Spring Boot WebFlux
  + 10696 jetty.sh doesn't work with JETTY_USER in Jetty 10.0.17 thru Jetty
    12.0.2
- + 10669 Provide ability to defer initial deployment of webapps until after
-   Server has started
  + 10705 Creating a `HTTP3ServerConnector` with a `SslContextFactory` that has
    a non-null `SSLContext` makes the server fail to start with an unclear error
    message

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpSender.java
@@ -543,7 +543,7 @@ protected Action process() throws Throwable
         }
 
         @Override
-        public void succeeded()
+        protected void onSuccess()
         {
             boolean proceed = true;
             if (committed)
@@ -588,8 +588,6 @@ else if (expect100)
                 // There was some concurrent error, terminate.
                 complete = true;
             }
-
-            super.succeeded();
         }
 
         @Override

diff --git a/...-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpSenderOverHTTP.java b/...-client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpSenderOverHTTP.java
@@ -235,17 +235,9 @@ protected Action process() throws Exception
         }
 
         @Override
-        public void succeeded()
+        protected void onSuccess()
         {
             release();
-            super.succeeded();
-        }
-
-        @Override
-        public void failed(Throwable x)
-        {
-            release();
-            super.failed(x);
         }
 
         @Override
@@ -259,6 +251,7 @@ protected void onCompleteSuccess()
         protected void onCompleteFailure(Throwable cause)
         {
             super.onCompleteFailure(cause);
+            release();
             callback.failed(cause);
         }
 

diff --git a/.../jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java b/.../jetty-fcgi/jetty-fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java
@@ -101,12 +101,11 @@ protected void onCompleteSuccess()
         }
 
         @Override
-        public void succeeded()
+        protected void onSuccess()
         {
             if (active != null)
                 active.succeeded();
             active = null;
-            super.succeeded();
         }
 
         @Override

diff --git a/...http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java b/...http2/jetty-http2-common/src/main/java/org/eclipse/jetty/http2/internal/HTTP2Flusher.java
@@ -294,7 +294,7 @@ protected Action process() throws Throwable
     }
 
     @Override
-    public void succeeded()
+    protected void onSuccess()
     {
         if (LOG.isDebugEnabled())
             LOG.debug("Written {} buffers - entries processed/pending {}/{}: {}/{}",
@@ -304,7 +304,6 @@ public void succeeded()
                 processedEntries,
                 pendingEntries);
         finish();
-        super.succeeded();
     }
 
     private void finish()

diff --git a/...ttp2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java b/...ttp2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/RawHTTP2ProxyTest.java
@@ -515,17 +515,15 @@ public void failed(Throwable failure)
         }
 
         @Override
-        public void succeeded()
+        protected void onSuccess()
         {
             frameInfo.callback.succeeded();
-            super.succeeded();
         }
 
         @Override
-        public void failed(Throwable failure)
+        protected void onCompleteFailure(Throwable cause)
         {
-            frameInfo.callback.failed(failure);
-            super.failed(failure);
+            frameInfo.callback.failed(cause);
         }
 
         @Override
@@ -671,17 +669,16 @@ protected Action process()
         }
 
         @Override
-        public void succeeded()
+        protected void onSuccess()
         {
             frameInfo.callback.succeeded();
             super.succeeded();
         }
 
         @Override
-        public void failed(Throwable failure)
+        protected void onCompleteFailure(Throwable cause)
         {
-            frameInfo.callback.failed(failure);
-            super.failed(failure);
+            frameInfo.callback.failed(cause);
         }
 
         private void offer(Stream stream, Frame frame, Callback callback)

diff --git a/.../jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java b/.../jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java
@@ -108,7 +108,7 @@ protected Action process()
     }
 
     @Override
-    public void succeeded()
+    protected void onSuccess()
     {
         if (LOG.isDebugEnabled())
             LOG.debug("succeeded to write {} on {}", entries, this);
@@ -119,8 +119,6 @@ public void succeeded()
         entries.clear();
 
         invocationType = InvocationType.NON_BLOCKING;
-
-        super.succeeded();
     }
 
     @Override

diff --git a/...ty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java b/...ty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java
@@ -104,14 +104,12 @@ protected Action process()
     }
 
     @Override
-    public void succeeded()
+    protected void onSuccess()
     {
         if (LOG.isDebugEnabled())
             LOG.debug("succeeded to write {} buffers on {}", accumulator.getByteBuffers().size(), this);
 
         accumulator.release();
-
-        super.succeeded();
     }
 
     @Override

diff --git a/.../jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java b/.../jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java
@@ -89,7 +89,7 @@ protected Action process()
     }
 
     @Override
-    public void succeeded()
+    protected void onSuccess()
     {
         if (LOG.isDebugEnabled())
             LOG.debug("succeeded to write {} on {}", entry, this);
@@ -98,19 +98,17 @@ public void succeeded()
 
         entry.callback.succeeded();
         entry = null;
-
-        super.succeeded();
     }
 
     @Override
-    public void failed(Throwable x)
+    protected void onCompleteFailure(Throwable cause)
     {
         if (LOG.isDebugEnabled())
-            LOG.debug("failed to write {} on {}", entry, this, x);
+            LOG.debug("failed to write {} on {}", entry, this, cause);
 
         accumulator.release();
 
-        entry.callback.failed(x);
+        entry.callback.failed(cause);
         entry = null;
 
         // Continue the iteration.

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/BufferedContentSink.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/content/BufferedContentSink.java
@@ -287,13 +287,12 @@ protected Action process()
         }
 
         @Override
-        public void succeeded()
+        protected void onSuccess()
         {
             _buffer = null;
             Callback callback = _callback;
             _callback = null;
             callback.succeeded();
-            super.succeeded();
         }
 
         @Override

diff --git a/...ty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConnection.java b/...ty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicConnection.java
@@ -372,17 +372,9 @@ protected Action process()
         }
 
         @Override
-        public void succeeded()
+        protected void onSuccess()
         {
             entry.callback.succeeded();
-            super.succeeded();
-        }
-
-        @Override
-        public void failed(Throwable x)
-        {
-            entry.callback.failed(x);
-            super.failed(x);
         }
 
         @Override
@@ -394,10 +386,11 @@ public InvocationType getInvocationType()
         @Override
         protected void onCompleteFailure(Throwable cause)
         {
+            entry.callback.failed(cause);
             QuicConnection.this.close();
         }
 
-        private class Entry
+        private static class Entry
         {
             private final Callback callback;
             private final SocketAddress address;

diff --git a/...jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSession.java b/...jetty-quic/jetty-quic-common/src/main/java/org/eclipse/jetty/quic/common/QuicSession.java
@@ -521,12 +521,11 @@ protected Action process() throws IOException
         }
 
         @Override
-        public void succeeded()
+        protected void onSuccess()
         {
             if (LOG.isDebugEnabled())
                 LOG.debug("written cipher bytes on {}", QuicSession.this);
             cipherBuffer.release();
-            super.succeeded();
         }
 
         @Override

diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ConnectHandler.java
@@ -760,17 +760,11 @@ else if (filled == 0)
             }
 
             @Override
-            public void succeeded()
+            protected void onSuccess()
             {
                 if (LOG.isDebugEnabled())
                     LOG.debug("Wrote {} bytes {}", filled, TunnelConnection.this);
                 buffer.release();
-                super.succeeded();
-            }
-
-            @Override
-            protected void onCompleteSuccess()
-            {
             }
 
             @Override

diff --git a/...transports/src/test/java/org/eclipse/jetty/test/client/transport/CustomTransportTest.java b/...transports/src/test/java/org/eclipse/jetty/test/client/transport/CustomTransportTest.java
@@ -237,7 +237,8 @@ public void onConnect(EndPoint endPoint)
             channels.put(channel.id, channel);
 
             // Register for read interest with the EndPoint.
-            endPoint.fillInterested(new EndPointToChannelCallback(channel));
+            EndPointToChannelCallback endPointToChannelCallback = new EndPointToChannelCallback(channel);
+            endPoint.fillInterested(Callback.from(endPointToChannelCallback::iterate));
         }
 
         // Called when there data to read from the Gateway on the given Channel.
@@ -322,18 +323,10 @@ protected Action process() throws Throwable
                     endPoint.fillInterested(this);
                     return Action.IDLE;
                 }
-                channel.write(this, buffer);
+                channel.write(Callback.from(this::iterate), buffer);
                 return Action.SCHEDULED;
             }
 
-            @Override
-            public void succeeded()
-            {
-                // There is data to read from the EndPoint.
-                // Iterate to read it and send it to the Gateway.
-                iterate();
-            }
-
             @Override
             protected void onCompleteSuccess()
             {

diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
@@ -167,6 +167,13 @@ protected IteratingCallback(boolean needReset)
      */
     protected abstract Action process() throws Throwable;
 
+    /**
+     * Invoked when one task has completed successfully.
+     */
+    protected void onSuccess()
+    {
+    }
+
     /**
      * Invoked when the overall task has completed successfully.
      *
@@ -239,6 +246,7 @@ private void processing()
         boolean notifyCompleteSuccess = false;
         Throwable notifyCompleteFailure = null;
 
+        boolean callOnSuccess = false;
         // While we are processing
         processing:
         while (true)
@@ -247,6 +255,11 @@ private void processing()
             Action action = null;
             try
             {
+                if (callOnSuccess)
+                {
+                    onSuccess();
+                    callOnSuccess = false;
+                }
                 action = process();
             }
             catch (Throwable x)
@@ -309,6 +322,7 @@ private void processing()
                             throw new IllegalStateException(String.format("%s[action=%s]", this, action));
                         // we lost the race, so we have to keep processing
                         _state = State.PROCESSING;
+                        callOnSuccess = true;
                         continue;
                     }
 
@@ -342,7 +356,7 @@ else if (notifyCompleteFailure != null)
      * to call {@code super.succeeded()}.
      */
     @Override
-    public void succeeded()
+    public final void succeeded()
     {
         boolean process = false;
         try (AutoLock ignored = _lock.lock())
@@ -374,7 +388,10 @@ public void succeeded()
             }
         }
         if (process)
+        {
+            onSuccess();
             processing();
+        }
     }
 
     /**
@@ -392,7 +409,7 @@ public void succeeded()
      * @see #isFailed()
      */
     @Override
-    public void failed(Throwable x)
+    public final void failed(Throwable x)
     {
         boolean failure = false;
         try (AutoLock ignored = _lock.lock())

diff --git a/...y-ee10/jetty-ee10-proxy/src/main/java/org/eclipse/jetty/ee10/proxy/AsyncProxyServlet.java b/...y-ee10/jetty-ee10-proxy/src/main/java/org/eclipse/jetty/ee10/proxy/AsyncProxyServlet.java
@@ -192,10 +192,9 @@ protected void onRequestContent(HttpServletRequest request, Request proxyRequest
         }
 
         @Override
-        public void failed(Throwable x)
+        protected void onCompleteFailure(Throwable cause)
         {
-            super.failed(x);
-            onError(x);
+            onError(cause);
         }
     }
 

diff --git a/jetty-ee9/jetty-ee9-proxy/src/main/java/org/eclipse/jetty/ee9/proxy/AsyncProxyServlet.java b/jetty-ee9/jetty-ee9-proxy/src/main/java/org/eclipse/jetty/ee9/proxy/AsyncProxyServlet.java
@@ -192,10 +192,9 @@ protected void onRequestContent(HttpServletRequest request, Request proxyRequest
         }
 
         @Override
-        public void failed(Throwable x)
+        protected void onCompleteFailure(Throwable cause)
         {
-            super.failed(x);
-            onError(x);
+            onError(cause);
         }
     }