Skip to content

[Zen2] Move ClusterState fields to be persisted to ClusterState.MetaData #35625

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 25 commits into from
Nov 21, 2018
Merged

[Zen2] Move ClusterState fields to be persisted to ClusterState.MetaData #35625

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dc6eca4
CoordinationState inside ClusterState
Nov 15, 2018
b392435
Bug fix
Nov 15, 2018
f04e55b
Move CoordinationMetaData to MetaData
Nov 15, 2018
8d546ae
CoordinationMetaData.fromXContent, toString and isGlobalStateEquals
Nov 16, 2018
41f0394
Merge zen2 into zen2_coordination_state
Nov 16, 2018
4480147
final builder
Nov 19, 2018
58c856f
import VotingConfiguration
Nov 19, 2018
a0e86bf
cmd -> coordinationMetaData, cmdb -> coordinationMetaDataBuilder
Nov 19, 2018
ef622d7
Reuse old coordination metadata
Nov 19, 2018
9232c57
do not loose old metadata
Nov 19, 2018
143a9ec
do not loose old metadata 2
Nov 19, 2018
c3b0776
do not loose old metadata 3
Nov 19, 2018
4393666
Add voting tombstone to coordination meta in test
Nov 19, 2018
452b91e
do not loose coordination meta data
Nov 19, 2018
04e2324
squash fields equals assert into coordination metadata eq assert
Nov 19, 2018
9006e32
Add Zen2 BWC TODO
Nov 19, 2018
ef5341e
Fix ClusterStatsMonitoringDocTests
Nov 19, 2018
91171e9
Fix bug
Nov 19, 2018
16c4884
@SuppressWarnings("unchecked")
Nov 20, 2018
310d65a
Move set copy from builder to constructor
Nov 20, 2018
39392e1
Remove log from test
Nov 21, 2018
d99c52d
Rename JSON fields
Nov 21, 2018
219b569
MetaData.fromXContent fix
Nov 21, 2018
ec94914
Merge zen2 into zen2_coordination_state
Nov 21, 2018
482ae3f
Merge branch zen2 into zen2_coordination_state
Nov 21, 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
2 changes: 1 addition & 1 deletion ...rc/main/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package org.elasticsearch.action.admin.cluster.bootstrap;

import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.cluster.ClusterState.VotingConfiguration;
import org.elasticsearch.cluster.coordination.CoordinationMetaData.VotingConfiguration;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down
8 changes: 5 additions & 3 deletions .../elasticsearch/action/admin/cluster/configuration/TransportAddVotingTombstonesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterState.Builder;
import org.elasticsearch.cluster.ClusterStateObserver;
import org.elasticsearch.cluster.ClusterStateObserver.Listener;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.coordination.CoordinationMetaData;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.MetaData;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Priority;
Expand Down Expand Up @@ -90,9 +91,10 @@ public ClusterState execute(ClusterState currentState) {
assert resolvedNodes == null : resolvedNodes;
resolvedNodes = resolveNodesAndCheckMaximum(request, currentState);

final Builder builder = ClusterState.builder(currentState);
CoordinationMetaData.Builder builder = CoordinationMetaData.builder(currentState.coordinationMetaData());
Copy link
Contributor

@DaveCTurner DaveCTurner Nov 16, 2018

Choose a reason for hiding this comment

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

For consistency, could this be final please?

Copy link
Contributor Author

@andrershov andrershov Nov 19, 2018

Choose a reason for hiding this comment

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

4480147

resolvedNodes.forEach(builder::addVotingTombstone);
final ClusterState newState = builder.build();
final MetaData newMetaData = MetaData.builder(currentState.metaData()).coordinationMetaData(builder.build()).build();
final ClusterState newState = ClusterState.builder(currentState).metaData(newMetaData).build();
assert newState.getVotingTombstones().size() <= MAXIMUM_VOTING_TOMBSTONES_SETTING.get(currentState.metaData().settings());
return newState;
}
Expand Down
11 changes: 7 additions & 4 deletions ...lasticsearch/action/admin/cluster/configuration/TransportClearVotingTombstonesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterState.Builder;
import org.elasticsearch.cluster.ClusterStateObserver;
import org.elasticsearch.cluster.ClusterStateObserver.Listener;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.coordination.CoordinationMetaData;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.MetaData;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Priority;
Expand Down Expand Up @@ -119,9 +120,11 @@ private void submitClearTombstonesTask(ClearVotingTombstonesRequest request, lon
clusterService.submitStateUpdateTask("clear-voting-tombstones", new ClusterStateUpdateTask(Priority.URGENT) {
@Override
public ClusterState execute(ClusterState currentState) {
final Builder builder = ClusterState.builder(currentState);
builder.clearVotingTombstones();
return builder.build();
final CoordinationMetaData newCoordinationMetaData =
CoordinationMetaData.builder(currentState.coordinationMetaData()).clearVotingTombstones().build();
final MetaData newMetaData = MetaData.builder(currentState.metaData()).
coordinationMetaData(newCoordinationMetaData).build();
return ClusterState.builder(currentState).metaData(newMetaData).build();
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions ...c/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,9 @@ protected void masterOperation(final ClusterStateRequest request, final ClusterS
ClusterState currentState = clusterService.state();
logger.trace("Serving cluster state request using version {}", currentState.version());
ClusterState.Builder builder = ClusterState.builder(currentState.getClusterName());
builder.term(currentState.term());
builder.version(currentState.version());
builder.stateUUID(currentState.stateUUID());
builder.lastCommittedConfiguration(currentState.getLastCommittedConfiguration());
builder.lastAcceptedConfiguration(currentState.getLastAcceptedConfiguration());

if (request.nodes()) {
builder.nodes(currentState.nodes());
}
Expand All @@ -105,6 +103,7 @@ protected void masterOperation(final ClusterStateRequest request, final ClusterS

MetaData.Builder mdBuilder = MetaData.builder();
mdBuilder.clusterUUID(currentState.metaData().clusterUUID());
mdBuilder.coordinationMetaData(currentState.coordinationMetaData());

if (request.metaData()) {
if (request.indices().length > 0) {
Expand Down
Loading