Skip to content

Release cluster state bytes earlier in PublicationTransportHandler #127054

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Release cluster state bytes earlier in PublicationTransportHandler #127054

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
47 changes: 40 additions & 7 deletions server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.elasticsearch.transport.Transport;
import org.elasticsearch.transport.TransportException;
import org.elasticsearch.transport.TransportRequestOptions;
import org.elasticsearch.transport.TransportResponseHandler;
import org.elasticsearch.transport.TransportService;

import java.io.IOException;
Expand Down Expand Up @@ -106,13 +107,36 @@ public PublicationTransportHandler(
this.namedWriteableRegistry = namedWriteableRegistry;
this.handlePublishRequest = handlePublishRequest;

var generic = transportService.getThreadPool().generic();
transportService.registerRequestHandler(
PUBLISH_STATE_ACTION_NAME,
transportService.getThreadPool().generic(),
TransportResponseHandler.TRANSPORT_WORKER,
false,
false,
BytesTransportRequest::new,
(request, channel, task) -> this.handleIncomingPublishRequest(request, new ChannelActionListener<>(channel))
(req, channel, task) -> {
req.mustIncRef();
generic.execute(new ActionRunnable<>(new ChannelActionListener<PublishWithJoinResponse>(channel)) {

private BytesTransportRequest request = req;

@Override
protected void doRun() throws IOException {
var request = this.request;
this.request = null;
handleIncomingPublishRequest(request, listener);
}

@Override
public void onFailure(Exception e) {
if (request != null) {
request.decRef();
this.request = null;
}
super.onFailure(e);
}
});
}
);
}

Expand All @@ -129,10 +153,12 @@ private void handleIncomingPublishRequest(
BytesTransportRequest request,
ActionListener<PublishWithJoinResponse> publishResponseListener
) throws IOException {
assert ThreadPool.assertCurrentThreadPool(GENERIC);
final Compressor compressor = CompressorFactory.compressor(request.bytes());
StreamInput in = request.bytes().streamInput();
var bytes = request.bytes();
StreamInput in = bytes.streamInput();
try {
assert ThreadPool.assertCurrentThreadPool(GENERIC);
final Compressor compressor = CompressorFactory.compressor(bytes);
final int requestLength = bytes.length();
if (compressor != null) {
in = compressor.threadLocalStreamInput(in);
}
Expand All @@ -150,8 +176,10 @@ private void handleIncomingPublishRequest(
assert false : e;
throw e;
}
request.decRef();
request = null;
fullClusterStateReceivedCount.incrementAndGet();
logger.debug("received full cluster state version [{}] with size [{}]", incomingState.version(), request.bytes().length());
logger.debug("received full cluster state version [{}] with size [{}]", incomingState.version(), requestLength);
acceptState(incomingState, publishResponseListener.map(response -> {
lastSeenClusterState.set(incomingState);
return response;
Expand All @@ -164,12 +192,14 @@ private void handleIncomingPublishRequest(
throw new IncompatibleClusterStateVersionException("have no local cluster state");
} else {
final ClusterState incomingState = deserializeAndApplyDiff(request, in, lastSeen);
request.decRef();
request = null;
compatibleClusterStateDiffReceivedCount.incrementAndGet();
logger.debug(
"received diff cluster state version [{}] with uuid [{}], diff size [{}]",
incomingState.version(),
incomingState.stateUUID(),
request.bytes().length()
requestLength
);
acceptState(incomingState, publishResponseListener.map(response -> {
lastSeenClusterState.compareAndSet(lastSeen, incomingState);
Expand All @@ -178,6 +208,9 @@ private void handleIncomingPublishRequest(
}
}
} finally {
if (request != null) {
request.decRef();
}
IOUtils.close(in);
}
}
Expand Down