Skip to content
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

Jump to bottom

Remove Discovery.AckListener.onTimeout() #30514

Merged
merged 2 commits into from
May 10, 2018
Merged

Remove Discovery.AckListener.onTimeout() #30514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d420323
Remove Discovery.AckListener.onTimeout()
DaveCTurner May 10, 2018
09e5747
timeoutOccurred is now always false
DaveCTurner May 10, 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
12 changes: 3 additions & 9 deletions server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ public Discovery.AckListener createAckListener(ThreadPool threadPool, ClusterSta
}
});

return new DelegetingAckListener(ackListeners);
return new DelegatingAckListener(ackListeners);
}

public boolean clusterStateUnchanged() {
Expand Down Expand Up @@ -541,11 +541,11 @@ protected void warnAboutSlowTaskIfNeeded(TimeValue executionTime, String source)
}
}

private static class DelegetingAckListener implements Discovery.AckListener {
private static class DelegatingAckListener implements Discovery.AckListener {

private final List<Discovery.AckListener> listeners;

private DelegetingAckListener(List<Discovery.AckListener> listeners) {
private DelegatingAckListener(List<Discovery.AckListener> listeners) {
this.listeners = listeners;
}

Expand All @@ -555,11 +555,6 @@ public void onNodeAck(DiscoveryNode node, @Nullable Exception e) {
listener.onNodeAck(node, e);
}
}

@Override
public void onTimeout() {
throw new UnsupportedOperationException("no timeout delegation");
}
}

private static class AckCountDownListener implements Discovery.AckListener {
Expand Down Expand Up @@ -614,7 +609,6 @@ public void onNodeAck(DiscoveryNode node, @Nullable Exception e) {
}
}

@Override
public void onTimeout() {
if (countDown.fastForward()) {
logger.trace("timeout waiting for acknowledgement for cluster_state update (version: {})", clusterStateVersion);
Expand Down
1 change: 0 additions & 1 deletion server/src/main/java/org/elasticsearch/discovery/Discovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public interface Discovery extends LifecycleComponent {

interface AckListener {
void onNodeAck(DiscoveryNode node, @Nullable Exception e);
void onTimeout();
}

class FailedToCommitClusterStateException extends ElasticsearchException {
Expand Down
12 changes: 0 additions & 12 deletions server/src/test/java/org/elasticsearch/discovery/zen/PublishClusterStateActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,6 @@ public AssertingAckListener publishState(PublishClusterStateAction action, Clust

public static class AssertingAckListener implements Discovery.AckListener {
private final List<Tuple<DiscoveryNode, Throwable>> errors = new CopyOnWriteArrayList<>();
private final AtomicBoolean timeoutOccurred = new AtomicBoolean();
private final CountDownLatch countDown;

public AssertingAckListener(int nodeCount) {
Expand All @@ -829,23 +828,12 @@ public void onNodeAck(DiscoveryNode node, @Nullable Exception e) {
countDown.countDown();
}

@Override
public void onTimeout() {
timeoutOccurred.set(true);
// Fast forward the counter - no reason to wait here
long currentCount = countDown.getCount();
for (long i = 0; i < currentCount; i++) {
countDown.countDown();
}
}

public void await(long timeout, TimeUnit unit) throws InterruptedException {
assertThat(awaitErrors(timeout, unit), emptyIterable());
}

public List<Tuple<DiscoveryNode, Throwable>> awaitErrors(long timeout, TimeUnit unit) throws InterruptedException {
countDown.await(timeout, unit);
assertFalse(timeoutOccurred.get());
return errors;
}

Expand Down