Skip to content

[Backport 3.6] Fix Flaky Test Report for Netty4Http3IT #21364

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

Merged
reta merged 1 commit into from
Apr 27, 2026
Merged

[Backport 3.6] Fix Flaky Test Report for Netty4Http3IT #21364

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
51 changes: 37 additions & 14 deletions ...ansport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4Http3IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.settings.Settings;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.http.AbstractHttpServerTransport;
import org.opensearch.http.HttpRequest.HttpVersion;
import org.opensearch.http.HttpServerTransport;
import org.opensearch.http.HttpTransportSettings;
import org.opensearch.http.netty4.http3.Http3Utils;
Expand All @@ -32,6 +34,7 @@
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLException;

import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.IntStream;
Expand All @@ -47,6 +50,7 @@

import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
Expand Down Expand Up @@ -81,22 +85,25 @@ public void testThatNettyHttpServerSupportsHttp2OrHttp3Get() throws Exception {

String[] requests = new String[] { "/", "/_nodes/stats", "/", "/_cluster/state", "/" };
HttpServerTransport httpServerTransport = internalCluster().getInstance(HttpServerTransport.class);
TransportAddress[] boundAddresses = httpServerTransport.boundAddress().boundAddresses();
TransportAddress transportAddress = randomFrom(boundAddresses);
assertThat(httpServerTransport, instanceOf(Netty4CompositeHttpServerTransport.class));

@SuppressWarnings("unchecked")
final Tuple<Netty4HttpClient, String> client = randomFrom(
Tuple.tuple(Netty4HttpClient.http3().withLogger(logger), "h2="),
Tuple.tuple(Netty4HttpClient.https().withLogger(logger), "h3=")
final Tuple<Netty4HttpClient, Tuple<String, HttpVersion>> client = randomFrom(
Tuple.tuple(Netty4HttpClient.http3().withLogger(logger), Tuple.tuple("h2=", HttpVersion.HTTP_3_0)),
Tuple.tuple(Netty4HttpClient.https().withLogger(logger), Tuple.tuple("h3=", HttpVersion.HTTP_2_0))
);

try (Netty4HttpClient nettyHttpClient = client.v1()) {
Collection<FullHttpResponse> responses = nettyHttpClient.get(transportAddress.address(), randomFrom(requests));
final TransportAddress transportAddress = randomFrom(
(Netty4CompositeHttpServerTransport) httpServerTransport,
client.v2().v2()
);
final Collection<FullHttpResponse> responses = nettyHttpClient.get(transportAddress.address(), randomFrom(requests));
try {
assertThat(responses, hasSize(1));

for (HttpResponse response : responses) {
assertThat(response.headers().get("Alt-Svc"), containsString(client.v2()));
assertThat(response.headers().get("Alt-Svc"), containsString(client.v2().v1()));
}

Collection<String> opaqueIds = Netty4HttpClient.returnOpaqueIds(responses);
Expand All @@ -115,23 +122,26 @@ public void testThatNettyHttpServerSupportsHttp2OrHttp3Post() throws Exception {

final List<Tuple<String, CharSequence>> requests = List.of(Tuple.tuple("/_search", "{\"query\":{ \"match_all\":{}}}"));
HttpServerTransport httpServerTransport = internalCluster().getInstance(HttpServerTransport.class);
TransportAddress[] boundAddresses = httpServerTransport.boundAddress().boundAddresses();
TransportAddress transportAddress = randomFrom(boundAddresses);
assertThat(httpServerTransport, instanceOf(Netty4CompositeHttpServerTransport.class));

@SuppressWarnings("unchecked")
final Tuple<Netty4HttpClient, String> client = randomFrom(
Tuple.tuple(Netty4HttpClient.http3().withLogger(logger), "h2="),
Tuple.tuple(Netty4HttpClient.https().withLogger(logger), "h3=")
final Tuple<Netty4HttpClient, Tuple<String, HttpVersion>> client = randomFrom(
Tuple.tuple(Netty4HttpClient.http3().withLogger(logger), Tuple.tuple("h2=", HttpVersion.HTTP_3_0)),
Tuple.tuple(Netty4HttpClient.https().withLogger(logger), Tuple.tuple("h3=", HttpVersion.HTTP_2_0))
);

try (Netty4HttpClient nettyHttpClient = client.v1()) {
Collection<FullHttpResponse> responses = nettyHttpClient.post(transportAddress.address(), requests);
final TransportAddress transportAddress = randomFrom(
(Netty4CompositeHttpServerTransport) httpServerTransport,
client.v2().v2()
);
final Collection<FullHttpResponse> responses = nettyHttpClient.post(transportAddress.address(), requests);
try {
assertThat(responses, hasSize(1));

for (FullHttpResponse response : responses) {
assertThat(response.status(), equalTo(HttpResponseStatus.OK));
assertThat(response.headers().get("Alt-Svc"), containsString(client.v2()));
assertThat(response.headers().get("Alt-Svc"), containsString(client.v2().v1()));
}

Collection<String> opaqueIds = Netty4HttpClient.returnOpaqueIds(responses);
Expand All @@ -157,6 +167,19 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
return Stream.concat(super.nodePlugins().stream(), Stream.of(SecureSettingsPlugin.class)).toList();
}

private TransportAddress randomFrom(final Netty4CompositeHttpServerTransport transport, HttpVersion protocol) {
final AbstractHttpServerTransport httpServerTransport = Arrays.stream(transport.transports()).filter(t -> {
if (protocol == HttpVersion.HTTP_3_0) {
return t instanceof Netty4Http3ServerTransport;
} else {
return t instanceof Netty4HttpServerTransport;
}
}).findAny().orElseThrow();

TransportAddress[] boundAddresses = httpServerTransport.boundAddress().boundAddresses();
return randomFrom(boundAddresses);
}

private void assertOpaqueIdsInAnyOrder(int expected, Collection<String> opaqueIds) {
// check if opaque ids are present in any order, since for HTTP/2 we use streaming (no head of line blocking)
// and responses may come back at any order
Expand Down
4 changes: 4 additions & 0 deletions ...t-netty4/src/main/java/org/opensearch/http/netty4/Netty4CompositeHttpServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,8 @@ protected void doClose() throws IOException {
IOUtils.closeWhileHandlingException(transport);
}
}

AbstractHttpServerTransport[] transports() {
return transports;
}
}
Loading