fix BlockingContentProducer staying blocked on semaphore when an erro…

…r occurs Signed-off-by: Ludovic Orban <[email protected]>
jetty · Jan 8, 2025 · 111337f · 111337f
1 parent 054f268
commit 111337f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 4 deletions.
diff --git a/...jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/AsyncContentProducer.java b/...jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/AsyncContentProducer.java
@@ -395,6 +395,12 @@ void release()
             _condition.signal();
         }
 
+        void fail()
+        {
+            _permits = Integer.MAX_VALUE;
+            _condition.signal();
+        }
+
         @Override
         public String toString()
         {

diff --git a/...ty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/BlockingContentProducer.java b/...ty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/BlockingContentProducer.java
@@ -153,8 +153,9 @@ public boolean onContentProducible()
         // Calling _asyncContentProducer.onContentProducible() changes the channel state from WAITING to WOKEN which
         // would prevent the async error thread from noticing that a redispatching is needed.
         boolean unready = _asyncContentProducer.isUnready();
+        boolean error = _asyncContentProducer.isError();
         if (LOG.isDebugEnabled())
-            LOG.debug("onContentProducible releasing semaphore {} unready={}", _semaphore, unready);
+            LOG.debug("onContentProducible releasing semaphore {} unready={} error={}", _semaphore, unready, error);
         // Do not release the semaphore if we are not unready, as certain protocols may call this method
         // just after having received the request, not only when they have read all the available content.
         if (unready)
@@ -163,6 +164,8 @@ public boolean onContentProducible()
             _asyncContentProducer.getServletChannel().getServletRequestState().onReadIdle();
             _semaphore.release();
         }
+        if (error)
+            _semaphore.fail();
         return false;
     }
 }
diff --git a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/BlockingTest.java b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/BlockingTest.java
@@ -161,7 +161,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
                 StackTraceElement[] stackTrace = threadRef.get().getStackTrace();
                 for (StackTraceElement stackTraceElement : stackTrace)
                 {
-                    System.out.println(stackTraceElement);
+                    System.err.println(stackTraceElement);
                 }
             }
             assertTrue(await);

diff --git a/...jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/AsyncContentProducer.java b/...jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/AsyncContentProducer.java
@@ -395,6 +395,12 @@ void release()
             _condition.signal();
         }
 
+        void fail()
+        {
+            _permits = Integer.MAX_VALUE;
+            _condition.signal();
+        }
+
         @Override
         public String toString()
         {

diff --git a/...ty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/BlockingContentProducer.java b/...ty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/BlockingContentProducer.java
@@ -153,8 +153,9 @@ public boolean onContentProducible()
         // Calling _asyncContentProducer.onContentProducible() changes the channel state from WAITING to WOKEN which
         // would prevent the async error thread from noticing that a redispatching is needed.
         boolean unready = _asyncContentProducer.isUnready();
+        boolean error = _asyncContentProducer.isError();
         if (LOG.isDebugEnabled())
-            LOG.debug("onContentProducible releasing semaphore {} unready={}", _semaphore, unready);
+            LOG.debug("onContentProducible releasing semaphore {} unready={} error={}", _semaphore, unready, error);
         // Do not release the semaphore if we are not unready, as certain protocols may call this method
         // just after having received the request, not only when they have read all the available content.
         if (unready)
@@ -163,6 +164,8 @@ public boolean onContentProducible()
             _asyncContentProducer.getServletChannel().getServletRequestState().onReadIdle();
             _semaphore.release();
         }
+        if (error)
+            _semaphore.fail();
         return false;
     }
 }
diff --git a/jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/BlockingTest.java b/jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/BlockingTest.java
@@ -161,7 +161,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
                 StackTraceElement[] stackTrace = threadRef.get().getStackTrace();
                 for (StackTraceElement stackTraceElement : stackTrace)
                 {
-                    System.out.println(stackTraceElement);
+                    System.err.println(stackTraceElement);
                 }
             }
             assertTrue(await);