Add term and config to cluster state #32100
Merged
Conversation
This file contains 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
ywelsch
added
>enhancement
v7.0.0
:Distributed Coordination/Cluster Coordination
|
Pinging @elastic/es-distributed |
DaveCTurner
reviewed
Jul 17, 2018
| } | ||
|
|
||
| public void testVotingConfiguration() { | ||
| ClusterState.VotingConfiguration config0 = new ClusterState.VotingConfiguration(Sets.newHashSet()); |
There was a problem hiding this comment.
Could we also assert that this is .equals(VotingConfiguration.EMPTY_CONFIG)?
| assertThat(config3.hasQuorum(Sets.newHashSet("id2")), equalTo(false)); | ||
| assertThat(config3.hasQuorum(Sets.newHashSet("id3")), equalTo(false)); | ||
| assertThat(config3.hasQuorum(Sets.newHashSet("id1", "id4")), equalTo(false)); | ||
| assertThat(config3.hasQuorum(Sets.newHashSet()), equalTo(false)); |
There was a problem hiding this comment.
Could we also assertThat(config3.hasQuorum(Sets.newHashSet("id1", "id4", "id5")), equalTo(false));?
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { |
There was a problem hiding this comment.
I don't see any assertions that this works - specifically that it ever returns false. Could we have some?
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(nodeIds); |
There was a problem hiding this comment.
Is there an easy way to assert that this is consistent with equals()?
61 tasks
DaveCTurner
approved these changes
Jul 17, 2018
| @@ -77,7 +77,10 @@ protected void masterOperation(final ClusterStateRequest request, final ClusterS | |||
| logger.trace("Serving cluster state request using version {}", currentState.version()); | |||
| ClusterState.Builder builder = ClusterState.builder(currentState.getClusterName()); | |||
| builder.version(currentState.version()); | |||
| builder.term(currentState.term()); | |||
There was a problem hiding this comment.
Missed a term<->version swap.
|
Thanks @DaveCTurner |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adds the publication term and the last accepted and committed configurations to the cluster state, following the formal model in https://github.com/elastic/elasticsearch-formal-models/blob/master/ZenWithTerms/tla/ZenWithTerms.tla
The term represents the reign of a master, and the last committed / accepted configurations represent the set of quorums that cluster state changes will require (If there's no reconfiguration, last accepted and last committed configurations coincide).
We might end up shifting the last committed and last accepted configuration to a different sub-object of the cluster state (e.g. MetaData), but this depends mainly on the storage system that we will chose further down the line. The most natural object for now is the main cluster state object.
Relates to #32006