Skip to content

Release InboundMessage and request instances earlier #126998

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 1 commit into from
Apr 17, 2025
Merged

Release InboundMessage and request instances earlier #126998

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
18 changes: 13 additions & 5 deletions server/src/main/java/org/elasticsearch/transport/InboundHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ private <T extends TransportRequest> void handleRequest(TcpChannel channel, Inbo
Releasables.assertOnce(message.takeBreakerReleaseControl())
);

try (message) {
try {
messageListener.onRequestReceived(requestId, action);
if (reg != null) {
reg.addRequestStats(header.getNetworkMessageSize() + TcpHeader.BYTES_REQUIRED_FOR_MESSAGE_SIZE);
Expand All @@ -278,9 +278,11 @@ private <T extends TransportRequest> void handleRequest(TcpChannel channel, Inbo
assert reg != null;
final StreamInput stream = namedWriteableStream(message.openOrGetStreamInput());
assert assertRemoteVersion(stream, header.getVersion());
final T request;
T request;
try {
request = reg.newRequest(stream);
message.close();
message = null;
} catch (Exception e) {
assert ignoreDeserializationErrors : e;
throw e;
Expand All @@ -295,13 +297,20 @@ private <T extends TransportRequest> void handleRequest(TcpChannel channel, Inbo
doHandleRequest(reg, request, transportChannel);
}
} else {
handleRequestForking(request, reg, transportChannel);
handleRequestForking(/* autocloses */ request, reg, transportChannel);
request = null; // now owned by the thread we forked to
}
} finally {
request.decRef();
if (request != null) {
request.decRef();
}
}
} catch (Exception e) {
sendErrorResponse(action, transportChannel, e);
} finally {
if (message != null) {
message.close();
}
}
}

Expand All @@ -315,7 +324,6 @@ private static <T extends TransportRequest> void doHandleRequest(RequestHandlerR

private <T extends TransportRequest> void handleRequestForking(T request, RequestHandlerRegistry<T> reg, TransportChannel channel) {
boolean success = false;
request.mustIncRef();
try {
reg.getExecutor().execute(threadPool.getThreadContext().preserveContextWithTracing(new AbstractRunnable() {
@Override
Expand Down