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

Bootstrap a Zen2 cluster once quorum is discovered #37463

Merged
merged 27 commits into from
Jan 22, 2019
Merged

Bootstrap a Zen2 cluster once quorum is discovered #37463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8f538fc
Simplify ClusterBootstrapService
DaveCTurner Jan 14, 2019
9742709
Line length
DaveCTurner Jan 15, 2019
3a040f4
Merge branch 'master' into 2018-01-09-simple-cluster-bootstrap-service
DaveCTurner Jan 15, 2019
c4555ac
Assert that the bootstrap configuration contains only Zen2 master-eli…
DaveCTurner Jan 15, 2019
61af11d
Clarify why bootstrapping was cancelled
DaveCTurner Jan 15, 2019
7d70a29
Throw exception if requirements match multiple nodes or v.v.
DaveCTurner Jan 15, 2019
2ff94a0
Do not retry if bootstrapping throws an exception
DaveCTurner Jan 17, 2019
526acba
Do not include any extra nodes in the bootstrap configuration
DaveCTurner Jan 17, 2019
9d2bc20
Revert "Do not retry if bootstrapping throws an exception"
DaveCTurner Jan 17, 2019
8df9f66
Best-effort avoidance of bootstrapping if already bootstrapped
DaveCTurner Jan 17, 2019
39d37da
Merge branch 'master' into 2018-01-09-simple-cluster-bootstrap-service
DaveCTurner Jan 18, 2019
7a75c0b
Line length
DaveCTurner Jan 18, 2019
1c10574
Bootstrap a Zen2 cluster once quorum is discovered
DaveCTurner Jan 18, 2019
28b9d46
One blasted character over the limit
DaveCTurner Jan 18, 2019
8185e13
Add ClusterBootstrapService::isBootstrapPlaceholder
DaveCTurner Jan 21, 2019
dfaa7de
Unnecessary assert
DaveCTurner Jan 21, 2019
c0d62af
Use clusterNode.applyInitialConfiguration
DaveCTurner Jan 21, 2019
eadc797
Reject duplicate requirements early
DaveCTurner Jan 21, 2019
f5b75f4
Use placeholders in coordinator tests
DaveCTurner Jan 21, 2019
a83dff7
Rename initialMasterNodes to bootstrapRequirements
DaveCTurner Jan 21, 2019
c716734
Include requirement in the bootstrap placeholder
DaveCTurner Jan 21, 2019
f30ab6e
Permit bootstrapping in any mode
DaveCTurner Jan 21, 2019
c639939
Merge branch 'master' into 2018-01-09-simple-cluster-bootstrap-service
DaveCTurner Jan 21, 2019
b40144f
Add trailing hyphen to placeholder prefix
DaveCTurner Jan 21, 2019
2878bd6
Trace logging
DaveCTurner Jan 21, 2019
b757444
Make requirements unmodifiable
DaveCTurner Jan 21, 2019
72e6787
Merge branch 'master' into 2018-01-09-simple-cluster-bootstrap-service
DaveCTurner Jan 22, 2019
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
4 changes: 1 addition & 3 deletions server/src/main/java/org/elasticsearch/ElasticsearchException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,10 +1009,8 @@ private enum ElasticsearchExceptionHandle {
MultiBucketConsumerService.TooManyBucketsException::new, 149, Version.V_7_0_0),
COORDINATION_STATE_REJECTED_EXCEPTION(org.elasticsearch.cluster.coordination.CoordinationStateRejectedException.class,
org.elasticsearch.cluster.coordination.CoordinationStateRejectedException::new, 150, Version.V_7_0_0),
CLUSTER_ALREADY_BOOTSTRAPPED_EXCEPTION(org.elasticsearch.cluster.coordination.ClusterAlreadyBootstrappedException.class,
org.elasticsearch.cluster.coordination.ClusterAlreadyBootstrappedException::new, 151, Version.V_7_0_0),
SNAPSHOT_IN_PROGRESS_EXCEPTION(org.elasticsearch.snapshots.SnapshotInProgressException.class,
org.elasticsearch.snapshots.SnapshotInProgressException::new, 152, Version.V_7_0_0);
org.elasticsearch.snapshots.SnapshotInProgressException::new, 151, Version.V_7_0_0);
Copy link
Contributor

Choose a reason for hiding this comment

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

👍


final Class<? extends ElasticsearchException> exceptionClass;
final CheckedFunction<StreamInput, ? extends ElasticsearchException, IOException> constructor;
Expand Down
6 changes: 0 additions & 6 deletions server/src/main/java/org/elasticsearch/action/ActionModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
import org.apache.logging.log4j.LogManager;
import org.elasticsearch.action.admin.cluster.allocation.ClusterAllocationExplainAction;
import org.elasticsearch.action.admin.cluster.allocation.TransportClusterAllocationExplainAction;
import org.elasticsearch.action.admin.cluster.bootstrap.BootstrapClusterAction;
import org.elasticsearch.action.admin.cluster.bootstrap.GetDiscoveredNodesAction;
import org.elasticsearch.action.admin.cluster.bootstrap.TransportBootstrapClusterAction;
import org.elasticsearch.action.admin.cluster.bootstrap.TransportGetDiscoveredNodesAction;
import org.elasticsearch.action.admin.cluster.configuration.AddVotingConfigExclusionsAction;
import org.elasticsearch.action.admin.cluster.configuration.ClearVotingConfigExclusionsAction;
import org.elasticsearch.action.admin.cluster.configuration.TransportAddVotingConfigExclusionsAction;
Expand Down Expand Up @@ -433,8 +429,6 @@ public <Request extends ActionRequest, Response extends ActionResponse> void reg
actions.register(GetTaskAction.INSTANCE, TransportGetTaskAction.class);
actions.register(CancelTasksAction.INSTANCE, TransportCancelTasksAction.class);

actions.register(GetDiscoveredNodesAction.INSTANCE, TransportGetDiscoveredNodesAction.class);
actions.register(BootstrapClusterAction.INSTANCE, TransportBootstrapClusterAction.class);
actions.register(AddVotingConfigExclusionsAction.INSTANCE, TransportAddVotingConfigExclusionsAction.class);
actions.register(ClearVotingConfigExclusionsAction.INSTANCE, TransportClearVotingConfigExclusionsAction.class);
actions.register(ClusterAllocationExplainAction.INSTANCE, TransportClusterAllocationExplainAction.class);
Expand Down
41 changes: 0 additions & 41 deletions ...rc/main/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapClusterAction.java
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions ...c/main/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapClusterRequest.java
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions .../main/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapClusterResponse.java
View file
Open in desktop

This file was deleted.

179 changes: 0 additions & 179 deletions ...rc/main/java/org/elasticsearch/action/admin/cluster/bootstrap/BootstrapConfiguration.java
View file
Open in desktop

This file was deleted.

Loading