Skip to content
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

Fix HTTP/2 Upgrade flow for requests with content (post/put/...) #7105

Merged
merged 4 commits into from
Apr 11, 2023
Merged

Fix HTTP/2 Upgrade flow for requests with content (post/put/...) #7105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b23035a
Fix HTTP/2 Upgrade flow for requests with content (post/put/...)
reta Apr 11, 2023
7d696cd
Address code review comments
reta Apr 11, 2023
1bd7d82
Address code review comments
reta Apr 11, 2023
af69e95
Address code review comments
reta Apr 11, 2023
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
39 changes: 33 additions & 6 deletions ...ansport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4Http2IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,21 @@
package org.opensearch.http.netty4;

import io.netty.handler.codec.http.FullHttpResponse;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.ReferenceCounted;
import org.opensearch.OpenSearchNetty4IntegTestCase;
import org.opensearch.common.collect.Tuple;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.http.HttpServerTransport;
import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
import org.opensearch.test.OpenSearchIntegTestCase.Scope;

import java.util.Collection;
import java.util.List;
import java.util.Locale;
import java.util.stream.IntStream;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.hasSize;

Expand All @@ -31,7 +35,7 @@ protected boolean addMockHttpTransport() {
return false; // enable http
}

public void testThatNettyHttpServerSupportsHttp2() throws Exception {
public void testThatNettyHttpServerSupportsHttp2GetUpgrades() throws Exception {
String[] requests = new String[] { "/", "/_nodes/stats", "/", "/_cluster/state", "/" };

HttpServerTransport httpServerTransport = internalCluster().getInstance(HttpServerTransport.class);
Expand All @@ -44,19 +48,42 @@ public void testThatNettyHttpServerSupportsHttp2() throws Exception {
assertThat(responses, hasSize(5));

Collection<String> opaqueIds = Netty4HttpClient.returnOpaqueIds(responses);
assertOpaqueIdsInAnyOrder(opaqueIds);
assertOpaqueIdsInAnyOrder(5, opaqueIds);
} finally {
responses.forEach(ReferenceCounted::release);
}
}
}

private void assertOpaqueIdsInAnyOrder(Collection<String> opaqueIds) {
public void testThatNettyHttpServerSupportsHttp2PostUpgrades() 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);

try (Netty4HttpClient nettyHttpClient = Netty4HttpClient.http2()) {
Collection<FullHttpResponse> responses = nettyHttpClient.post(transportAddress.address(), requests);
try {
assertThat(responses, hasSize(1));

for (FullHttpResponse response : responses) {
assertThat(response.getStatus(), equalTo(HttpResponseStatus.OK));
}

Collection<String> opaqueIds = Netty4HttpClient.returnOpaqueIds(responses);
String msg = String.format(Locale.ROOT, "Expected opaque id [0], got [%s]", opaqueIds);
assertOpaqueIdsInAnyOrder(1, opaqueIds);
} finally {
responses.forEach(ReferenceCounted::release);
}
}
}

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
int i = 0;
String msg = String.format(Locale.ROOT, "Expected list of opaque ids to be in any order, got [%s]", opaqueIds);
assertThat(msg, opaqueIds, containsInAnyOrder(IntStream.range(0, 5).mapToObj(Integer::toString).toArray()));
assertThat(opaqueIds, containsInAnyOrder(IntStream.range(0, expected).mapToObj(Integer::toString).toArray()));
}

}
6 changes: 5 additions & 1 deletion .../transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,11 @@ public UpgradeCodec newUpgradeCodec(CharSequence protocol) {
handlingSettings.getMaxChunkSize()
);

final HttpServerUpgradeHandler upgradeHandler = new HttpServerUpgradeHandler(sourceCodec, upgradeCodecFactory);
final HttpServerUpgradeHandler upgradeHandler = new HttpServerUpgradeHandler(
sourceCodec,
upgradeCodecFactory,
handlingSettings.getMaxContentLength()
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found this one while prototyping #3000: by default, Netty assumes the upgrade is initiated by GET requests, but in case of OpenSearch, that is not necessarily the case.

);
final CleartextHttp2ServerUpgradeHandler cleartextUpgradeHandler = new CleartextHttp2ServerUpgradeHandler(
sourceCodec,
upgradeHandler,
Expand Down
8 changes: 5 additions & 3 deletions modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,15 @@ private List<FullHttpResponse> processRequestsWithBody(
List<Tuple<String, CharSequence>> urisAndBodies
) throws InterruptedException {
List<HttpRequest> requests = new ArrayList<>(urisAndBodies.size());
for (Tuple<String, CharSequence> uriAndBody : urisAndBodies) {
for (int i = 0; i < urisAndBodies.size(); ++i) {
final Tuple<String, CharSequence> uriAndBody = urisAndBodies.get(i);
ByteBuf content = Unpooled.copiedBuffer(uriAndBody.v2(), StandardCharsets.UTF_8);
HttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, method, uriAndBody.v1(), content);
request.headers().add(HttpHeaderNames.HOST, "localhost");
request.headers().add(HttpHeaderNames.CONTENT_LENGTH, content.readableBytes());
request.headers().add(HttpHeaderNames.CONTENT_TYPE, "application/json");
request.headers().add(HttpConversionUtil.ExtensionHeaderNames.SCHEME.text(), "http");
request.headers().add("X-Opaque-ID", String.valueOf(i));
requests.add(request);
}
return sendRequests(remoteAddress, requests);
Expand Down Expand Up @@ -211,7 +213,7 @@ private synchronized List<FullHttpResponse> sendRequests(final SocketAddress rem

} finally {
if (channelFuture != null) {
channelFuture.channel().close().sync();
channelFuture.channel().close().awaitUninterruptibly();
}
}

Expand Down Expand Up @@ -368,7 +370,7 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
request.headers().add(HttpHeaderNames.HOST, "localhost");
request.headers().add(HttpConversionUtil.ExtensionHeaderNames.SCHEME.text(), "http");

ctx.channel().attr(AttributeKey.newInstance("upgrade")).set(true);
ctx.channel().attr(AttributeKey.valueOf("upgrade")).set(true);
ctx.writeAndFlush(request);
ctx.fireChannelActive();

Expand Down