[Zen2] VotingTombstone class #35832
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ | |
| import org.elasticsearch.action.ActionRequestValidationException; | ||
| import org.elasticsearch.action.support.master.MasterNodeRequest; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.coordination.CoordinationMetaData.VotingTombstone; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.cluster.node.DiscoveryNodes; | ||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
|
|
@@ -69,10 +70,10 @@ public AddVotingTombstonesRequest(StreamInput in) throws IOException { | |
| timeout = in.readTimeValue(); | ||
| } | ||
|
|
||
| Set<VotingTombstone> resolveNodes(ClusterState currentState) { | ||
| final DiscoveryNodes allNodes = currentState.nodes(); | ||
| final Set<VotingTombstone> resolvedNodes = Arrays.stream(allNodes.resolveNodes(nodeDescriptions)) | ||
| .map(allNodes::get).filter(DiscoveryNode::isMasterNode).map(VotingTombstone::new).collect(Collectors.toSet()); | ||
|
|
||
| if (resolvedNodes.isEmpty()) { | ||
| throw new IllegalArgumentException("add voting tombstones request for " + Arrays.asList(nodeDescriptions) | ||
|
|
@@ -83,8 +84,8 @@ Set<DiscoveryNode> resolveNodes(ClusterState currentState) { | |
| return resolvedNodes; | ||
| } | ||
|
|
||
| Set<VotingTombstone> resolveNodesAndCheckMaximum(ClusterState currentState, int maxTombstoneCount, String maximumSettingKey) { | ||
|
There was a problem hiding this comment. idem here (resolveVoting.... There was a problem hiding this comment. And forgot "AndCheckMaximumPart" 8f63927 |
||
| final Set<VotingTombstone> resolvedNodes = resolveNodes(currentState); | ||
|
|
||
| final int oldTombstoneCount = currentState.getVotingTombstones().size(); | ||
| final int newTombstoneCount = resolvedNodes.size(); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,40 +49,48 @@ public class CoordinationMetaData implements Writeable, ToXContentFragment { | |
|
|
||
| private final VotingConfiguration lastAcceptedConfiguration; | ||
|
|
||
| private final Set<VotingTombstone> votingTombstones; | ||
|
|
||
| private static final ParseField TERM_PARSE_FIELD = new ParseField("term"); | ||
| private static final ParseField LAST_COMMITTED_CONFIGURATION_FIELD = new ParseField("last_committed_config"); | ||
| private static final ParseField LAST_ACCEPTED_CONFIGURATION_FIELD = new ParseField("last_accepted_config"); | ||
| private static final ParseField VOTING_TOMBSTONES_FIELD = new ParseField("voting_tombstones"); | ||
|
|
||
| private static long term(Object[] termAndConfigs) { | ||
| return (long)termAndConfigs[0]; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static VotingConfiguration lastCommittedConfig(Object[] fields) { | ||
| List<String> nodeIds = (List<String>) fields[1]; | ||
| return new VotingConfiguration(new HashSet<>(nodeIds)); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static VotingConfiguration lastAcceptedConfig(Object[] fields) { | ||
| List<String> nodeIds = (List<String>) fields[2]; | ||
| return new VotingConfiguration(new HashSet<>(nodeIds)); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static Set<VotingTombstone> votingTombstones(Object[] fields) { | ||
| Set<VotingTombstone> votingTombstones = new HashSet<>((List<VotingTombstone>) fields[3]); | ||
| return votingTombstones; | ||
| } | ||
|
|
||
| private static final ConstructingObjectParser<CoordinationMetaData, Void> PARSER = new ConstructingObjectParser<>( | ||
| "coordination_metadata", | ||
| fields -> new CoordinationMetaData(term(fields), lastCommittedConfig(fields), | ||
| lastAcceptedConfig(fields), votingTombstones(fields))); | ||
| static { | ||
| PARSER.declareLong(ConstructingObjectParser.constructorArg(), TERM_PARSE_FIELD); | ||
| PARSER.declareStringArray(ConstructingObjectParser.constructorArg(), LAST_COMMITTED_CONFIGURATION_FIELD); | ||
| PARSER.declareStringArray(ConstructingObjectParser.constructorArg(), LAST_ACCEPTED_CONFIGURATION_FIELD); | ||
| PARSER.declareObjectArray(ConstructingObjectParser.constructorArg(), VotingTombstone.PARSER, VOTING_TOMBSTONES_FIELD); | ||
| } | ||
|
|
||
| public CoordinationMetaData(long term, VotingConfiguration lastCommittedConfiguration, VotingConfiguration lastAcceptedConfiguration, | ||
| Set<VotingTombstone> votingTombstones) { | ||
| this.term = term; | ||
| this.lastCommittedConfiguration = lastCommittedConfiguration; | ||
| this.lastAcceptedConfiguration = lastAcceptedConfiguration; | ||
|
|
@@ -93,7 +101,7 @@ public CoordinationMetaData(StreamInput in) throws IOException { | |
| term = in.readLong(); | ||
| lastCommittedConfiguration = new VotingConfiguration(in); | ||
| lastAcceptedConfiguration = new VotingConfiguration(in); | ||
| votingTombstones = Collections.unmodifiableSet(in.readSet(VotingTombstone::new)); | ||
| } | ||
|
|
||
| public static Builder builder() { | ||
|
|
@@ -117,8 +125,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws | |
| return builder | ||
| .field(TERM_PARSE_FIELD.getPreferredName(), term) | ||
| .field(LAST_COMMITTED_CONFIGURATION_FIELD.getPreferredName(), lastCommittedConfiguration) | ||
| .field(LAST_ACCEPTED_CONFIGURATION_FIELD.getPreferredName(), lastAcceptedConfiguration) | ||
| .field(VOTING_TOMBSTONES_FIELD.getPreferredName(), votingTombstones); | ||
|
There was a problem hiding this comment. nit: indenting seems inconsistent here. |
||
| } | ||
|
|
||
| public static CoordinationMetaData fromXContent(XContentParser parser) throws IOException { | ||
|
|
@@ -137,7 +145,7 @@ public VotingConfiguration getLastCommittedConfiguration() { | |
| return lastCommittedConfiguration; | ||
| } | ||
|
|
||
| public Set<VotingTombstone> getVotingTombstones() { | ||
| return votingTombstones; | ||
| } | ||
|
|
||
|
|
@@ -177,7 +185,7 @@ public static class Builder { | |
| private long term = 0; | ||
| private VotingConfiguration lastCommittedConfiguration = VotingConfiguration.EMPTY_CONFIG; | ||
| private VotingConfiguration lastAcceptedConfiguration = VotingConfiguration.EMPTY_CONFIG; | ||
| private final Set<VotingTombstone> votingTombstones = new HashSet<>(); | ||
|
|
||
| public Builder() { | ||
|
|
||
|
|
@@ -205,7 +213,7 @@ public Builder lastAcceptedConfiguration(VotingConfiguration config) { | |
| return this; | ||
| } | ||
|
|
||
| public Builder addVotingTombstone(VotingTombstone tombstone) { | ||
| votingTombstones.add(tombstone); | ||
| return this; | ||
| } | ||
|
|
@@ -220,6 +228,97 @@ public CoordinationMetaData build() { | |
| } | ||
| } | ||
|
|
||
| public static class VotingTombstone implements Writeable, ToXContentFragment { | ||
| private String nodeId; | ||
|
There was a problem hiding this comment. I hate that things are not final by default in Java. 1037370 |
||
| private String nodeName; | ||
|
|
||
|
|
||
| public VotingTombstone(DiscoveryNode node) { | ||
| this(node.getId(), node.getName()); | ||
| } | ||
|
|
||
| public VotingTombstone(StreamInput in) throws IOException { | ||
| this.nodeId = in.readString(); | ||
| this.nodeName = in.readString(); | ||
| } | ||
|
|
||
| public VotingTombstone(String nodeId, String nodeName) { | ||
| this.nodeId = nodeId; | ||
| this.nodeName = nodeName; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(StreamOutput out) throws IOException { | ||
| out.writeString(nodeId); | ||
| out.writeString(nodeName); | ||
| } | ||
|
|
||
| public String getNodeId() { | ||
| return nodeId; | ||
| } | ||
|
|
||
| public String getNodeName() { | ||
| return nodeName; | ||
| } | ||
|
|
||
| private static final ParseField NODE_ID_PARSE_FIELD = new ParseField("node_id"); | ||
| private static final ParseField NODE_NAME_PARSE_FIELD = new ParseField("node_name"); | ||
|
|
||
| private static String nodeId(Object[] nodeIdAndName) { | ||
| return (String) nodeIdAndName[0]; | ||
| } | ||
|
|
||
| private static String nodeName(Object[] nodeIdAndName) { | ||
| return (String) nodeIdAndName[1]; | ||
| } | ||
|
|
||
| private static final ConstructingObjectParser<VotingTombstone, Void> PARSER = new ConstructingObjectParser<>( | ||
| "voting_tombstone", | ||
| nodeIdAndName -> new VotingTombstone(nodeId(nodeIdAndName), nodeName(nodeIdAndName)) | ||
| ); | ||
|
|
||
| static { | ||
| PARSER.declareString(ConstructingObjectParser.constructorArg(), NODE_ID_PARSE_FIELD); | ||
| PARSER.declareString(ConstructingObjectParser.constructorArg(), NODE_NAME_PARSE_FIELD); | ||
| } | ||
|
|
||
| public static VotingTombstone fromXContent(XContentParser parser) throws IOException { | ||
| return PARSER.parse(parser, null); | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| return builder.startObject() | ||
| .field(NODE_ID_PARSE_FIELD.getPreferredName(), nodeId) | ||
| .field(NODE_NAME_PARSE_FIELD.getPreferredName(), nodeName) | ||
| .endObject(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| VotingTombstone that = (VotingTombstone) o; | ||
| return Objects.equals(nodeId, that.nodeId) && | ||
| Objects.equals(nodeName, that.nodeName); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(nodeId, nodeName); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append('{').append(nodeId).append('}'); | ||
|
There was a problem hiding this comment. In |
||
| if (nodeName.length() > 0) { | ||
| sb.append('{').append(nodeName).append('}'); | ||
| } | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * A collection of persistent node ids, denoting the voting configuration for cluster state changes. | ||
| */ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe this should now be called
resolveVotingTombStones?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
f72bcbd