honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release HTTP Request Body Earlier (#57094) (#57110)

Browse Source 
We don't need to hold on to the request body past the beginning of sending
the response. There is no need to keep a reference to it until after the response
has been sent fully and we can eagerly release it here.
Note, this can be optimized further to release the contents even earlier but for now
this is an easy increment to saving some memory on the IO pool.
This commit is contained in:
Armin Braun 2020-05-25 13:00:19 +02:00 committed by GitHub
parent 9fa60f7367
commit 56401d3f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java
View File

@ -196,7 +196,7 @@ public class Netty4HttpRequest implements HttpRequest {
@Override @Override
public Netty4HttpResponse createResponse(RestStatus status, BytesReference content) { public Netty4HttpResponse createResponse(RestStatus status, BytesReference content) {
return new Netty4HttpResponse(this, status, content); return new Netty4HttpResponse(request.headers(), request.protocolVersion(), status, content);
} }
@Override @Override

14
modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpResponse.java
View File

@ -20,7 +20,9 @@
package org.elasticsearch.http.netty4; package org.elasticsearch.http.netty4;
import io.netty.handler.codec.http.DefaultFullHttpResponse; import io.netty.handler.codec.http.DefaultFullHttpResponse;
import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.http.HttpResponse; import org.elasticsearch.http.HttpResponse;
import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.RestStatus;
@ -28,11 +30,11 @@ import org.elasticsearch.transport.netty4.Netty4Utils;
public class Netty4HttpResponse extends DefaultFullHttpResponse implements HttpResponse { public class Netty4HttpResponse extends DefaultFullHttpResponse implements HttpResponse {
private final Netty4HttpRequest request; private final HttpHeaders requestHeaders;
Netty4HttpResponse(Netty4HttpRequest request, RestStatus status, BytesReference content) { Netty4HttpResponse(HttpHeaders requestHeaders, HttpVersion version, RestStatus status, BytesReference content) {
super(request.nettyRequest().protocolVersion(), HttpResponseStatus.valueOf(status.getStatus()), Netty4Utils.toByteBuf(content)); super(version, HttpResponseStatus.valueOf(status.getStatus()), Netty4Utils.toByteBuf(content));
this.request = request; this.requestHeaders = requestHeaders;
} }
@Override @Override
@ -45,8 +47,8 @@ public class Netty4HttpResponse extends DefaultFullHttpResponse implements HttpR
return headers().contains(name); return headers().contains(name);
} }
public Netty4HttpRequest getRequest() { public HttpHeaders requestHeaders() {
return request; return requestHeaders;
} }
} }

8
modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/cors/Netty4CorsHandler.java
View File

@ -93,20 +93,20 @@ public class Netty4CorsHandler extends ChannelDuplexHandler {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
assert msg instanceof Netty4HttpResponse : "Invalid message type: " + msg.getClass(); assert msg instanceof Netty4HttpResponse : "Invalid message type: " + msg.getClass();
Netty4HttpResponse response = (Netty4HttpResponse) msg; Netty4HttpResponse response = (Netty4HttpResponse) msg;
setCorsResponseHeaders(response.getRequest().nettyRequest(), response, config); setCorsResponseHeaders(response.requestHeaders(), response, config);
ctx.write(response, promise); ctx.write(response, promise);
} }
public static void setCorsResponseHeaders(HttpRequest request, HttpResponse resp, CorsHandler.Config config) { public static void setCorsResponseHeaders(HttpHeaders headers, HttpResponse resp, CorsHandler.Config config) {
if (!config.isCorsSupportEnabled()) { if (!config.isCorsSupportEnabled()) {
return; return;
} }
String originHeader = request.headers().get(HttpHeaderNames.ORIGIN); String originHeader = headers.get(HttpHeaderNames.ORIGIN);
if (!Strings.isNullOrEmpty(originHeader)) { if (!Strings.isNullOrEmpty(originHeader)) {
final String originHeaderVal; final String originHeaderVal;
if (config.isAnyOriginSupported()) { if (config.isAnyOriginSupported()) {
originHeaderVal = ANY_ORIGIN; originHeaderVal = ANY_ORIGIN;
} else if (config.isOriginAllowed(originHeader) || isSameOrigin(originHeader, request.headers().get(HttpHeaderNames.HOST))) { } else if (config.isOriginAllowed(originHeader) || isSameOrigin(originHeader, headers.get(HttpHeaderNames.HOST))) {
originHeaderVal = originHeader; originHeaderVal = originHeader;
} else { } else {
originHeaderVal = null; originHeaderVal = null;

2
plugins/transport-nio/src/main/java/org/elasticsearch/http/nio/NioHttpRequest.java
View File

@ -194,7 +194,7 @@ public class NioHttpRequest implements HttpRequest {
@Override @Override
public NioHttpResponse createResponse(RestStatus status, BytesReference content) { public NioHttpResponse createResponse(RestStatus status, BytesReference content) {
return new NioHttpResponse(this, status, content); return new NioHttpResponse(request.headers(), request.protocolVersion(), status, content);
} }
@Override @Override

14
plugins/transport-nio/src/main/java/org/elasticsearch/http/nio/NioHttpResponse.java
View File

@ -20,18 +20,20 @@
package org.elasticsearch.http.nio; package org.elasticsearch.http.nio;
import io.netty.handler.codec.http.DefaultFullHttpResponse; import io.netty.handler.codec.http.DefaultFullHttpResponse;
import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpVersion;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.http.HttpResponse; import org.elasticsearch.http.HttpResponse;
import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.RestStatus;
public class NioHttpResponse extends DefaultFullHttpResponse implements HttpResponse { public class NioHttpResponse extends DefaultFullHttpResponse implements HttpResponse {
private final NioHttpRequest request; private final HttpHeaders requestHeaders;
NioHttpResponse(NioHttpRequest request, RestStatus status, BytesReference content) { NioHttpResponse(HttpHeaders requestHeaders, HttpVersion version, RestStatus status, BytesReference content) {
super(request.nettyRequest().protocolVersion(), HttpResponseStatus.valueOf(status.getStatus()), ByteBufUtils.toByteBuf(content)); super(version, HttpResponseStatus.valueOf(status.getStatus()), ByteBufUtils.toByteBuf(content));
this.request = request; this.requestHeaders = requestHeaders;
} }
@Override @Override
@ -44,7 +46,7 @@ public class NioHttpResponse extends DefaultFullHttpResponse implements HttpResp
return headers().contains(name); return headers().contains(name);
} }
public NioHttpRequest getRequest() { public HttpHeaders requestHeaders() {
return request; return requestHeaders;
} }
} }

10
plugins/transport-nio/src/main/java/org/elasticsearch/http/nio/cors/NioCorsHandler.java
View File

@ -50,7 +50,7 @@ import java.util.stream.Collectors;
public class NioCorsHandler extends ChannelDuplexHandler { public class NioCorsHandler extends ChannelDuplexHandler {
public static final String ANY_ORIGIN = "*"; public static final String ANY_ORIGIN = "*";
private static Pattern SCHEME_PATTERN = Pattern.compile("^https?://"); private static final Pattern SCHEME_PATTERN = Pattern.compile("^https?://");
private final CorsHandler.Config config; private final CorsHandler.Config config;
private NioHttpRequest request; private NioHttpRequest request;
@ -94,20 +94,20 @@ public class NioCorsHandler extends ChannelDuplexHandler {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
assert msg instanceof NioHttpResponse : "Invalid message type: " + msg.getClass(); assert msg instanceof NioHttpResponse : "Invalid message type: " + msg.getClass();
NioHttpResponse response = (NioHttpResponse) msg; NioHttpResponse response = (NioHttpResponse) msg;
setCorsResponseHeaders(response.getRequest().nettyRequest(), response, config); setCorsResponseHeaders(response.requestHeaders(), response, config);
ctx.write(response, promise); ctx.write(response, promise);
} }
public static void setCorsResponseHeaders(HttpRequest request, HttpResponse resp, CorsHandler.Config config) { public static void setCorsResponseHeaders(HttpHeaders headers, HttpResponse resp, CorsHandler.Config config) {
if (!config.isCorsSupportEnabled()) { if (!config.isCorsSupportEnabled()) {
return; return;
} }
String originHeader = request.headers().get(HttpHeaderNames.ORIGIN); String originHeader = headers.get(HttpHeaderNames.ORIGIN);
if (!Strings.isNullOrEmpty(originHeader)) { if (!Strings.isNullOrEmpty(originHeader)) {
final String originHeaderVal; final String originHeaderVal;
if (config.isAnyOriginSupported()) { if (config.isAnyOriginSupported()) {
originHeaderVal = ANY_ORIGIN; originHeaderVal = ANY_ORIGIN;
} else if (config.isOriginAllowed(originHeader) || isSameOrigin(originHeader, request.headers().get(HttpHeaderNames.HOST))) { } else if (config.isOriginAllowed(originHeader) || isSameOrigin(originHeader, headers.get(HttpHeaderNames.HOST))) {
originHeaderVal = originHeader; originHeaderVal = originHeader;
} else { } else {
originHeaderVal = null; originHeaderVal = null;

6
server/src/main/java/org/elasticsearch/http/DefaultRestChannel.java
View File

@ -83,8 +83,10 @@ public class DefaultRestChannel extends AbstractRestChannel implements RestChann
@Override @Override
public void sendResponse(RestResponse restResponse) { public void sendResponse(RestResponse restResponse) {
final ArrayList<Releasable> toClose = new ArrayList<>(4); // We're sending a response so we know we won't be needing the request content again and release it
toClose.add(httpRequest::release); Releasables.closeWhileHandlingException(httpRequest::release);
final ArrayList<Releasable> toClose = new ArrayList<>(3);
if (isCloseConnection()) { if (isCloseConnection()) {
toClose.add(() -> CloseableChannel.closeChannel(httpChannel)); toClose.add(() -> CloseableChannel.closeChannel(httpChannel));
} }