Skip to content

Commit 63db96e

Browse files
authored
Ensure monitoring/_bulk route is fully aggregated (#113319)
This route still exists in the code even if it is two major version old. We should still support it properly with our streaming changes.
1 parent 6b11af3 commit 63db96e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,9 @@ protected HttpMessage createMessage(String[] initialLine) throws Exception {
374374
// combines the HTTP message pieces into a single full HTTP request (with headers and body)
375375
final HttpObjectAggregator aggregator = new Netty4HttpAggregator(
376376
handlingSettings.maxContentLength(),
377-
httpPreRequest -> enabled.get() == false || (httpPreRequest.rawPath().endsWith("/_bulk") == false)
377+
httpPreRequest -> enabled.get() == false
378+
|| ((httpPreRequest.rawPath().endsWith("/_bulk") == false)
379+
|| httpPreRequest.rawPath().startsWith("/_xpack/monitoring/_bulk"))
378380
);
379381
aggregator.setMaxCumulationBufferComponents(transport.maxCompositeBufferComponents);
380382
ch.pipeline()

0 commit comments

Comments
 (0)