Skip to content

Make TransportAddVotingConfigExclusionsAction retryable #98568

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
Aug 17, 2023
Merged

Make TransportAddVotingConfigExclusionsAction retryable #98568

Show file tree
Hide file tree
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
33 changes: 14 additions & 19 deletions ...icsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;

import java.util.HashSet;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;

public class TransportAddVotingConfigExclusionsAction extends TransportMasterNodeAction<
AddVotingConfigExclusionsRequest,
Expand Down Expand Up @@ -99,13 +99,14 @@ protected void masterOperation(

clusterService.submitStateUpdateTask("add-voting-config-exclusions", new ClusterStateUpdateTask(Priority.URGENT) {

private Set<VotingConfigExclusion> resolvedExclusions;

@Override
public ClusterState execute(ClusterState currentState) {
assert resolvedExclusions == null : resolvedExclusions;
final int finalMaxVotingConfigExclusions = TransportAddVotingConfigExclusionsAction.this.maxVotingConfigExclusions;
resolvedExclusions = resolveVotingConfigExclusionsAndCheckMaximum(request, currentState, finalMaxVotingConfigExclusions);
final Set<VotingConfigExclusion> resolvedExclusions = resolveVotingConfigExclusionsAndCheckMaximum(
request,
currentState,
finalMaxVotingConfigExclusions
);

final CoordinationMetadata.Builder builder = CoordinationMetadata.builder(currentState.coordinationMetadata());
resolvedExclusions.forEach(builder::addVotingConfigExclusion);
Expand All @@ -130,13 +131,13 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
threadPool.getThreadContext()
);

final Set<String> excludedNodeIds = resolvedExclusions.stream()
.map(VotingConfigExclusion::getNodeId)
.collect(Collectors.toSet());

final Predicate<ClusterState> allNodesRemoved = clusterState -> {
final Set<String> votingConfigNodeIds = clusterState.getLastCommittedConfiguration().getNodeIds();
return excludedNodeIds.stream().noneMatch(votingConfigNodeIds::contains);
final Set<String> votingConfigNodeIds = new HashSet<>();
votingConfigNodeIds.addAll(clusterState.getLastCommittedConfiguration().getNodeIds());
votingConfigNodeIds.addAll(clusterState.getLastAcceptedConfiguration().getNodeIds());
return clusterState.getVotingConfigExclusions()
.stream()
.noneMatch(votingConfigExclusion -> votingConfigNodeIds.contains(votingConfigExclusion.getNodeId()));
};

final Listener clusterStateListener = new Listener() {
Expand All @@ -148,20 +149,14 @@ public void onNewClusterState(ClusterState state) {
@Override
public void onClusterServiceClose() {
listener.onFailure(
new ElasticsearchException(
"cluster service closed while waiting for voting config exclusions "
+ resolvedExclusions
+ " to take effect"
)
new ElasticsearchException("cluster service closed while waiting for voting config exclusions to take effect")
);
}

@Override
public void onTimeout(TimeValue timeout) {
listener.onFailure(
new ElasticsearchTimeoutException(
"timed out waiting for voting config exclusions " + resolvedExclusions + " to take effect"
)
new ElasticsearchTimeoutException("timed out waiting for voting config exclusions to take effect")
);
}
};
Expand Down
Loading