Skip to content

fix: configure Undertow test entity size #12892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zhengcy05 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −9
Open

fix: configure Undertow test entity size #12892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,7 @@ tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.55"
# checkForUpdates: tomcat-embed-core9:9.+
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.118"
truth = "com.google.truth:truth:1.4.5"
# 2.2.39 fails UndertowInteropTest.veryLargeRequest()
# https://github.com/grpc/grpc-java/issues/12859
# (disabled) checkForUpdates: undertow-servlet22:2.2.+
# checkForUpdates: undertow-servlet22:2.2.38.Final
undertow-servlet22 = "io.undertow:undertow-servlet:2.2.38.Final"
# 2.3.21 fails UndertowInteropTest.veryLargeRequest()
# https://github.com/grpc/grpc-java/issues/12859
# checkForUpdates: undertow-servlet:2.3.20.Final
undertow-servlet = "io.undertow:undertow-servlet:2.3.20.Final"
# checkForUpdates: undertow-servlet22:2.2.+
undertow-servlet22 = "io.undertow:undertow-servlet:2.2.39.Final"
# checkForUpdates: undertow-servlet:2.3.+
undertow-servlet = "io.undertow:undertow-servlet:2.3.21.Final"
2 changes: 2 additions & 0 deletions servlet/src/undertowTest/java/io/grpc/servlet/UndertowInteropTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
public class UndertowInteropTest extends AbstractInteropTest {
private static final String HOST = "localhost";
private static final String MYAPP = "/grpc.testing.TestService";
private static final long MAX_ENTITY_SIZE = AbstractInteropTest.MAX_MESSAGE_SIZE;
private int port;
private Undertow server;
private DeploymentManager manager;
Expand Down Expand Up @@ -101,6 +102,7 @@ protected void startServer(ServerBuilder<?> builder) {
.addPrefixPath("/", servletHandler); // for unimplementedService test
server = Undertow.builder()
.setServerOption(UndertowOptions.ENABLE_HTTP2, true)
.setServerOption(UndertowOptions.MAX_ENTITY_SIZE, MAX_ENTITY_SIZE)
.setServerOption(UndertowOptions.SHUTDOWN_TIMEOUT, 5000 /* 5 sec */)
.addHttpListener(0, HOST)
.setHandler(path)
Expand Down
2 changes: 2 additions & 0 deletions servlet/src/undertowTest/java/io/grpc/servlet/UndertowTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public class UndertowTransportTest extends AbstractTransportTest {

private static final String HOST = "localhost";
private static final String MYAPP = "/service";
private static final long MAX_ENTITY_SIZE = Integer.MAX_VALUE;

private final FakeClock fakeClock = new FakeClock();

Expand Down Expand Up @@ -131,6 +132,7 @@ public void start(ServerListener listener) throws IOException {
undertowServer =
Undertow.builder()
.setServerOption(UndertowOptions.ENABLE_HTTP2, true)
.setServerOption(UndertowOptions.MAX_ENTITY_SIZE, MAX_ENTITY_SIZE)
.setServerOption(UndertowOptions.SHUTDOWN_TIMEOUT, 5000 /* 5 sec */)
.addHttpListener(0, HOST)
.setHandler(path)
Expand Down
Loading