Skip to content

Commit 9dda15a

Browse files
committed
Configure Jetty with VirtualThreadPool
Prior to this commit, Spring Boot would auto-configure a `QueuedThreadPool` on the Jetty embedded server when the virtual threads option is enabled. This commit configures instead the dedicated `VirtualThreadPool` that the Jetty team recommends when Virtual Threads is supported. Fixes gh-47690
1 parent 9f9c178 commit 9dda15a

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/JettyVirtualThreadsWebServerFactoryCustomizer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.autoconfigure.web.embedded;
1818

1919
import org.eclipse.jetty.util.VirtualThreads;
20-
import org.eclipse.jetty.util.thread.QueuedThreadPool;
20+
import org.eclipse.jetty.util.thread.VirtualThreadPool;
2121

2222
import org.springframework.boot.autoconfigure.web.ServerProperties;
2323
import org.springframework.boot.web.embedded.jetty.ConfigurableJettyWebServerFactory;
@@ -29,6 +29,7 @@
2929
* Activates virtual threads on the {@link ConfigurableJettyWebServerFactory}.
3030
*
3131
* @author Moritz Halbritter
32+
* @author Brian Clozel
3233
* @since 3.2.0
3334
*/
3435
public class JettyVirtualThreadsWebServerFactoryCustomizer
@@ -43,9 +44,9 @@ public JettyVirtualThreadsWebServerFactoryCustomizer(ServerProperties serverProp
4344
@Override
4445
public void customize(ConfigurableJettyWebServerFactory factory) {
4546
Assert.state(VirtualThreads.areSupported(), "Virtual threads are not supported");
46-
QueuedThreadPool threadPool = JettyThreadPool.create(this.serverProperties.getJetty().getThreads());
47-
threadPool.setVirtualThreadsExecutor(VirtualThreads.getNamedVirtualThreadsExecutor("jetty-"));
48-
factory.setThreadPool(threadPool);
47+
VirtualThreadPool virtualThreadPool = new VirtualThreadPool();
48+
virtualThreadPool.setName("jetty-");
49+
factory.setThreadPool(virtualThreadPool);
4950
}
5051

5152
@Override

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/JettyVirtualThreadsWebServerFactoryCustomizerTests.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,7 @@
1616

1717
package org.springframework.boot.autoconfigure.web.embedded;
1818

19-
import java.time.Duration;
20-
import java.util.concurrent.Executor;
21-
import java.util.concurrent.atomic.AtomicReference;
22-
23-
import org.awaitility.Awaitility;
24-
import org.eclipse.jetty.util.thread.QueuedThreadPool;
25-
import org.hamcrest.Matchers;
19+
import org.eclipse.jetty.util.thread.VirtualThreadPool;
2620
import org.junit.jupiter.api.Test;
2721
import org.junit.jupiter.api.condition.EnabledForJreRange;
2822
import org.junit.jupiter.api.condition.JRE;
@@ -51,14 +45,9 @@ void shouldConfigureVirtualThreads() {
5145
ConfigurableJettyWebServerFactory factory = mock(ConfigurableJettyWebServerFactory.class);
5246
customizer.customize(factory);
5347
then(factory).should().setThreadPool(assertArg((threadPool) -> {
54-
assertThat(threadPool).isInstanceOf(QueuedThreadPool.class);
55-
QueuedThreadPool queuedThreadPool = (QueuedThreadPool) threadPool;
56-
Executor executor = queuedThreadPool.getVirtualThreadsExecutor();
57-
assertThat(executor).isNotNull();
58-
AtomicReference<String> threadName = new AtomicReference<>();
59-
executor.execute(() -> threadName.set(Thread.currentThread().getName()));
60-
Awaitility.await().atMost(Duration.ofSeconds(1)).untilAtomic(threadName, Matchers.notNullValue());
61-
assertThat(threadName.get()).startsWith("jetty-");
48+
assertThat(threadPool).isInstanceOf(VirtualThreadPool.class);
49+
VirtualThreadPool virtualThreadPool = (VirtualThreadPool) threadPool;
50+
assertThat(virtualThreadPool.getName()).isEqualTo("jetty-");
6251
}));
6352
}
6453

0 commit comments

Comments
 (0)