Skip to content

Improve Netty4IncrementalRequestHandlingIT #127768

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
merged 2 commits into from
May 6, 2025
Merged

Improve Netty4IncrementalRequestHandlingIT #127768

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6e2dae
Improve `Netty4IncrementalRequestHandlingIT`
DaveCTurner May 6, 2025
c70acd4
Merge branch 'main' into 2025/05/06/netty-incremental-handling-tests-…
DaveCTurner May 6, 2025
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
19 changes: 11 additions & 8 deletions ...nalClusterTest/java/org/elasticsearch/http/netty4/Netty4IncrementalRequestHandlingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
import org.elasticsearch.common.util.CollectionUtils;
import org.elasticsearch.core.Releasable;
import org.elasticsearch.core.Releasables;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.features.NodeFeature;
import org.elasticsearch.http.HttpBodyTracer;
import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.http.HttpTransportSettings;
import org.elasticsearch.index.IndexingPressure;
import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin;
Expand Down Expand Up @@ -107,6 +107,8 @@
import static io.netty.handler.codec.http.HttpHeaderValues.APPLICATION_JSON;
import static io.netty.handler.codec.http.HttpMethod.POST;
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
import static org.elasticsearch.http.HttpTransportSettings.SETTING_HTTP_CLIENT_STATS_MAX_CLOSED_CHANNEL_AGE;
import static org.elasticsearch.http.HttpTransportSettings.SETTING_HTTP_MAX_CONTENT_LENGTH;
import static org.hamcrest.Matchers.anEmptyMap;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.greaterThan;
Expand All @@ -120,12 +122,13 @@ public class Netty4IncrementalRequestHandlingIT extends ESNetty4IntegTestCase {

@Override
protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
Settings.Builder builder = Settings.builder().put(super.nodeSettings(nodeOrdinal, otherSettings));
builder.put(
HttpTransportSettings.SETTING_HTTP_MAX_CONTENT_LENGTH.getKey(),
ByteSizeValue.of(MAX_CONTENT_LENGTH, ByteSizeUnit.BYTES)
);
return builder.build();
return Settings.builder()
.put(super.nodeSettings(nodeOrdinal, otherSettings))
// reduce max content length just to cut down test duration
.put(SETTING_HTTP_MAX_CONTENT_LENGTH.getKey(), ByteSizeValue.of(MAX_CONTENT_LENGTH, ByteSizeUnit.BYTES))
// disable time-based expiry of channel stats since we assert that the total request size accumulates
.put(SETTING_HTTP_CLIENT_STATS_MAX_CLOSED_CHANNEL_AGE.getKey(), TimeValue.MAX_VALUE)
.build();
}

// ensure empty http content has single 0 size chunk
Expand Down Expand Up @@ -436,7 +439,7 @@ public void testHttpClientStats() throws Exception {
clientContext.channel().writeAndFlush(httpRequest(opaqueId, contentSize));
clientContext.channel().writeAndFlush(randomContent(contentSize, true));
final var handler = clientContext.awaitRestChannelAccepted(opaqueId);
handler.readAllBytes();
assertEquals(contentSize, handler.readAllBytes());
handler.sendResponse(new RestResponse(RestStatus.OK, ""));
assertEquals(totalBytesSent, clientContext.transportStatsRequestBytesSize());
}
Expand Down