diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java index a40071dd3e3..6ad94fdbce9 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/AsyncMiddleManServletTest.java @@ -63,6 +63,7 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.io.RuntimeIOException; +import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; @@ -518,49 +519,52 @@ public class AsyncMiddleManServletTest @Test public void testUpstreamTransformationThrowsAfterCommittingProxyRequest() throws Exception { - startServer(new EchoHttpServlet()); - startProxy(new AsyncMiddleManServlet() + try (StacklessLogging scope = new StacklessLogging(HttpChannel.class)) { - @Override - protected ContentTransformer newClientRequestContentTransformer(HttpServletRequest clientRequest, Request proxyRequest) + startServer(new EchoHttpServlet()); + startProxy(new AsyncMiddleManServlet() { - return new ContentTransformer() + @Override + protected ContentTransformer newClientRequestContentTransformer(HttpServletRequest clientRequest, Request proxyRequest) { - private int count; - - @Override - public void transform(ByteBuffer input, boolean finished, List output) throws IOException + return new ContentTransformer() { - if (++count < 2) - output.add(input); - else - throw new NullPointerException("explicitly_thrown_by_test"); - } - }; - } - }); - startClient(); + private int count; - final CountDownLatch latch = new CountDownLatch(1); - DeferredContentProvider content = new DeferredContentProvider(); - client.newRequest("localhost", serverConnector.getLocalPort()) - .content(content) - .send(new Response.CompleteListener() + @Override + public void transform(ByteBuffer input, boolean finished, List output) throws IOException + { + if (++count < 2) + output.add(input); + else + throw new NullPointerException("explicitly_thrown_by_test"); + } + }; + } + }); + startClient(); + + final CountDownLatch latch = new CountDownLatch(1); + DeferredContentProvider content = new DeferredContentProvider(); + client.newRequest("localhost", serverConnector.getLocalPort()) + .content(content) + .send(new Response.CompleteListener() + { + @Override + public void onComplete(Result result) { - @Override - public void onComplete(Result result) - { - if (result.isSucceeded() && result.getResponse().getStatus() == 502) - latch.countDown(); - } - }); + if (result.isSucceeded() && result.getResponse().getStatus() == 502) + latch.countDown(); + } + }); - content.offer(ByteBuffer.allocate(512)); - sleep(1000); - content.offer(ByteBuffer.allocate(512)); - content.close(); + content.offer(ByteBuffer.allocate(512)); + sleep(1000); + content.offer(ByteBuffer.allocate(512)); + content.close(); - Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); + } } @Test @@ -791,41 +795,44 @@ public class AsyncMiddleManServletTest @Test public void testClientRequestReadFailsOnSecondRead() throws Exception { - startServer(new EchoHttpServlet()); - startProxy(new AsyncMiddleManServlet() + try (StacklessLogging scope = new StacklessLogging(HttpChannel.class)) { - private int count; - - @Override - protected int readClientRequestContent(ServletInputStream input, byte[] buffer) throws IOException + startServer(new EchoHttpServlet()); + startProxy(new AsyncMiddleManServlet() { - if (++count < 2) - return super.readClientRequestContent(input, buffer); - else - throw new IOException("explicitly_thrown_by_test"); - } - }); - startClient(); + private int count; - final CountDownLatch latch = new CountDownLatch(1); - DeferredContentProvider content = new DeferredContentProvider(); - client.newRequest("localhost", serverConnector.getLocalPort()) - .content(content) - .send(new Response.CompleteListener() + @Override + protected int readClientRequestContent(ServletInputStream input, byte[] buffer) throws IOException { - @Override - public void onComplete(Result result) - { - if (result.getResponse().getStatus() == 502) - latch.countDown(); - } - }); - content.offer(ByteBuffer.allocate(512)); - sleep(1000); - content.offer(ByteBuffer.allocate(512)); - content.close(); + if (++count < 2) + return super.readClientRequestContent(input, buffer); + else + throw new IOException("explicitly_thrown_by_test"); + } + }); + startClient(); - Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); + final CountDownLatch latch = new CountDownLatch(1); + DeferredContentProvider content = new DeferredContentProvider(); + client.newRequest("localhost", serverConnector.getLocalPort()) + .content(content) + .send(new Response.CompleteListener() + { + @Override + public void onComplete(Result result) + { + if (result.getResponse().getStatus() == 502) + latch.countDown(); + } + }); + content.offer(ByteBuffer.allocate(512)); + sleep(1000); + content.offer(ByteBuffer.allocate(512)); + content.close(); + + Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); + } } @Test diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java index f524e237cba..e581f9f83f1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java @@ -842,7 +842,7 @@ public class HttpInput extends ServletInputStream implements Runnable } } else if (content==null) - throw new IllegalStateException(); + return; } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java index d51241e7167..7d19f56f2f8 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import java.nio.channels.SelectionKey; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.ArrayList; @@ -50,7 +49,6 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.LeakTrackingByteBufferPool; -import org.eclipse.jetty.io.ManagedSelector; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; @@ -245,30 +243,6 @@ public class ThreadStarvationTest }); } -// new Thread(()->{ -// try -// { -// TimeUnit.SECONDS.sleep(10); -// -// ServerConnector conn = _server.getBean(ServerConnector.class); -// ManagedSelector ms = conn.getSelectorManager().getBean(ManagedSelector.class); -// -// Selector sel = ms.getSelector(); -// sel.keys().stream().map((key)->key.attachment()).forEach( -// (attach) -> { -// System.out.println(attach); -// SocketChannelEndPoint endp = (SocketChannelEndPoint) attach; -// SslConnection sslconn = (SslConnection) endp.getConnection(); -// sslconn.dumpBuffers(); -// }); -// -// _server.dump(System.out, ""); -// } -// catch (Throwable ignore) -// { -// } -// }).start(); - try { List> responses = clientExecutors.invokeAll(clientTasks, 60, TimeUnit.SECONDS); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StacklessLogging.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StacklessLogging.java index 6fbf0b6faf4..5e07861790f 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StacklessLogging.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StacklessLogging.java @@ -46,7 +46,7 @@ public class StacklessLogging implements AutoCloseable { Logger log = Log.getLogger(clazz); // only operate on loggers that are of type StdErrLog - if (log instanceof StdErrLog) + if (log instanceof StdErrLog && !log.isDebugEnabled()) { StdErrLog stdErrLog=((StdErrLog)log); if (!stdErrLog.isHideStacks()) @@ -63,7 +63,7 @@ public class StacklessLogging implements AutoCloseable for (Logger log : logs) { // only operate on loggers that are of type StdErrLog - if (log instanceof StdErrLog) + if (log instanceof StdErrLog && !log.isDebugEnabled()) { StdErrLog stdErrLog=((StdErrLog)log); if (!stdErrLog.isHideStacks())