Skip to content

Zen2: Add Cluster State Applier #34257

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 22 commits into from
Oct 4, 2018
Merged

Zen2: Add Cluster State Applier #34257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
54632b6
Hook in Cluster State Applier
ywelsch Oct 2, 2018
4813b3e
unused import
ywelsch Oct 3, 2018
f8d1057
fix assertion
ywelsch Oct 3, 2018
2225704
Merge branch 'zen2' into applier-acking
ywelsch Oct 3, 2018
15a4da8
add comment
ywelsch Oct 3, 2018
42451ba
move assertion
ywelsch Oct 3, 2018
8c846dc
move anonymous to inner class
ywelsch Oct 3, 2018
8fecbd6
remove extra assert
ywelsch Oct 3, 2018
b77e5ab
clarify assertions around currentPublication
ywelsch Oct 3, 2018
a7c286c
remove superfluous parameter to stabilize
ywelsch Oct 3, 2018
7274f7b
Merge branch 'zen2' into applier-acking
ywelsch Oct 4, 2018
00938c2
add safety phase to acking tests
ywelsch Oct 4, 2018
cd22d4a
Separate logger for PublicationTransportHandler
ywelsch Oct 4, 2018
c59ef80
deduplicate completed field
ywelsch Oct 4, 2018
a6739a9
NoOpClusterApplier
ywelsch Oct 4, 2018
ca833e0
connect -> heal
ywelsch Oct 4, 2018
627d68b
revisit currentPublication check
ywelsch Oct 4, 2018
ff009b6
remove lastCommittedState
ywelsch Oct 4, 2018
cc10b84
add term-bump hack
ywelsch Oct 4, 2018
e2a4f41
Adapt DEFAULT_CLUSTER_STATE_UPDATE_DELAY
ywelsch Oct 4, 2018
84a69c1
refine activePublication check
ywelsch Oct 4, 2018
a773288
misc review feedback
ywelsch Oct 4, 2018
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
353 changes: 227 additions & 126 deletions server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/cluster/coordination/Publication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ public void onFaultyNode(DiscoveryNode faultyNode) {
onPossibleCompletion();
}

public boolean isCommitted() {
return applyCommitRequest.isPresent();
}

private void onPossibleCompletion() {
if (isCompleted) {
return;
Expand Down
36 changes: 28 additions & 8 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 @@ -20,7 +20,9 @@

import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportException;
import org.elasticsearch.transport.TransportRequestOptions;
Expand All @@ -29,19 +31,20 @@
import org.elasticsearch.transport.TransportService;

import java.io.IOException;
import java.util.function.Consumer;
import java.util.function.BiConsumer;
import java.util.function.Function;

public class PublicationTransportHandler {
public class PublicationTransportHandler extends AbstractComponent {

public static final String PUBLISH_STATE_ACTION_NAME = "internal:cluster/coordination/publish_state";
public static final String COMMIT_STATE_ACTION_NAME = "internal:cluster/coordination/commit_state";

private final TransportService transportService;

public PublicationTransportHandler(TransportService transportService,
public PublicationTransportHandler(Settings settings, TransportService transportService,
Function<PublishRequest, PublishWithJoinResponse> handlePublishRequest,
Consumer<ApplyCommitRequest> handleApplyCommit) {
BiConsumer<ApplyCommitRequest, ActionListener<Void>> handleApplyCommit) {
super(settings);
this.transportService = transportService;

transportService.registerRequestHandler(PUBLISH_STATE_ACTION_NAME, ThreadPool.Names.GENERIC, false, false,
Expand All @@ -50,10 +53,27 @@ public PublicationTransportHandler(TransportService transportService,

transportService.registerRequestHandler(COMMIT_STATE_ACTION_NAME, ThreadPool.Names.GENERIC, false, false,
ApplyCommitRequest::new,
(request, channel, task) -> {
handleApplyCommit.accept(request);
channel.sendResponse(TransportResponse.Empty.INSTANCE);
});
(request, channel, task) -> handleApplyCommit.accept(request, new ActionListener<Void>() {

@Override
public void onResponse(Void aVoid) {
try {
channel.sendResponse(TransportResponse.Empty.INSTANCE);
} catch (IOException e) {
logger.debug("failed to send response on commit", e);
}
}

@Override
public void onFailure(Exception e) {
try {
channel.sendResponse(e);
} catch (IOException ie) {
e.addSuppressed(ie);
logger.debug("failed to send response on commit", e);
}
}
}));
}

public void sendPublishRequest(DiscoveryNode destination, PublishRequest publishRequest,
Expand Down
Loading