Skip to content

[Zen2] Fix CoordinatorTests #34002

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 8 commits into from
Sep 25, 2018
Merged

[Zen2] Fix CoordinatorTests #34002

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0322869
Fix iteration order of joins in JoinHelper
DaveCTurner Sep 24, 2018
03e2b62
Overwrite local node
DaveCTurner Sep 24, 2018
01645e0
Fix Publication#onTimeout()
DaveCTurner Sep 24, 2018
defcc57
No need to fix up ClusterState, it should be done by the transport layer
DaveCTurner Sep 24, 2018
f4e988f
Usually de/serialize the response too
DaveCTurner Sep 24, 2018
2168a05
On reflection, always de/serialize the response, it has to have come …
DaveCTurner Sep 24, 2018
5d52c4a
Fix DisruptibleMockTransportTests
DaveCTurner Sep 24, 2018
a454f5c
Fix up more tests
DaveCTurner Sep 24, 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
8 changes: 7 additions & 1 deletion server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ private void handleApplyCommit(ApplyCommitRequest applyCommitRequest) {
}

PublishWithJoinResponse handlePublishRequest(PublishRequest publishRequest) {
// overwrite local node
Copy link
Contributor

@ywelsch ywelsch Sep 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why this is needed. As we're using the proper transport layer in our tests, this should be taken care of by PublicationTransportHandler?

Copy link
Contributor Author

@DaveCTurner DaveCTurner Sep 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well spotted, I hadn't realised that the transport layer should have been doing this when deserialising the request. The issue is that DisruptibleMockTransport doesn't de/serialize the requests before passing them on, so I've added that in defcc57.

publishRequest = new PublishRequest(ClusterState.builder(publishRequest.getAcceptedState()).nodes(
DiscoveryNodes.builder(publishRequest.getAcceptedState().nodes()).localNodeId(getLocalNode().getId()).build()).build());

synchronized (mutex) {
final DiscoveryNode sourceNode = publishRequest.getAcceptedState().nodes().getMasterNode();
logger.trace("handlePublishRequest: handling [{}] from [{}]", publishRequest, sourceNode);
Expand Down Expand Up @@ -560,7 +564,9 @@ protected void sendApplyCommit(DiscoveryNode destination, ApplyCommitRequest app
transportService.getThreadPool().schedule(publishTimeout, Names.GENERIC, new Runnable() {
@Override
public void run() {
publication.onTimeout();
synchronized (mutex) {
publication.onTimeout();
}
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/cluster/coordination/JoinHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -251,7 +252,7 @@ public void close(Mode newMode) {
assert closed == false : "CandidateJoinAccumulator closed";
closed = true;
if (newMode == Mode.LEADER) {
final Map<JoinTaskExecutor.Task, ClusterStateTaskListener> pendingAsTasks = new HashMap<>();
final Map<JoinTaskExecutor.Task, ClusterStateTaskListener> pendingAsTasks = new LinkedHashMap<>();
joinRequestAccumulator.forEach((key, value) -> {
final JoinTaskExecutor.Task task = new JoinTaskExecutor.Task(key, "elect leader");
pendingAsTasks.put(task, new JoinTaskListener(task, value));
Expand Down
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 @@ -70,6 +70,10 @@ public void start(Set<DiscoveryNode> faultyNodes) {
}

public void onTimeout() {
if (isCompleted) {
return;
}

assert timedOut == false;
timedOut = true;
if (applyCommitRequest.isPresent() == false) {
Expand Down