forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into alpha-not-ascii
* master: Fix Javadocs for BootstrapChecks#enforceLimits Disable bootstrap checks for single-node discovery Add unit tests for the missing aggregator (elastic#23895) Add a property to mark setting as final (elastic#23872) testDifferentRolesMaintainPathOnRestart - fix broken comment testDifferentRolesMaintainPathOnRestart - lower join timeout as split elections are likely Introduce single-node discovery Await termination after shutting down executors
- Loading branch information
Showing
22 changed files
with
893 additions
and
127 deletions.
There are no files selected for viewing
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
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
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
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
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
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
144 changes: 144 additions & 0 deletions
144
core/src/main/java/org/elasticsearch/discovery/single/SingleNodeDiscovery.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.discovery.single; | ||
|
|
||
| import org.elasticsearch.cluster.ClusterChangedEvent; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.ClusterStateTaskConfig; | ||
| import org.elasticsearch.cluster.ClusterStateTaskExecutor; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.cluster.node.DiscoveryNodes; | ||
| import org.elasticsearch.cluster.routing.allocation.AllocationService; | ||
| import org.elasticsearch.cluster.service.ClusterService; | ||
| import org.elasticsearch.common.Priority; | ||
| import org.elasticsearch.common.component.AbstractLifecycleComponent; | ||
| import org.elasticsearch.common.settings.ClusterSettings; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.discovery.Discovery; | ||
| import org.elasticsearch.discovery.DiscoverySettings; | ||
| import org.elasticsearch.discovery.DiscoveryStats; | ||
| import org.elasticsearch.discovery.zen.PendingClusterStateStats; | ||
| import org.elasticsearch.discovery.zen.PendingClusterStatesQueue; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * A discovery implementation where the only member of the cluster is the local node. | ||
| */ | ||
| public class SingleNodeDiscovery extends AbstractLifecycleComponent implements Discovery { | ||
|
|
||
| private final ClusterService clusterService; | ||
| private final DiscoverySettings discoverySettings; | ||
|
|
||
| public SingleNodeDiscovery(final Settings settings, final ClusterService clusterService) { | ||
| super(Objects.requireNonNull(settings)); | ||
| this.clusterService = Objects.requireNonNull(clusterService); | ||
| final ClusterSettings clusterSettings = | ||
| Objects.requireNonNull(clusterService.getClusterSettings()); | ||
| this.discoverySettings = new DiscoverySettings(settings, clusterSettings); | ||
| } | ||
|
|
||
| @Override | ||
| public DiscoveryNode localNode() { | ||
| return clusterService.localNode(); | ||
| } | ||
|
|
||
| @Override | ||
| public String nodeDescription() { | ||
| return clusterService.getClusterName().value() + "/" + clusterService.localNode().getId(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setAllocationService(final AllocationService allocationService) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void publish(final ClusterChangedEvent event, final AckListener listener) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public DiscoveryStats stats() { | ||
| return new DiscoveryStats((PendingClusterStateStats) null); | ||
| } | ||
|
|
||
| @Override | ||
| public DiscoverySettings getDiscoverySettings() { | ||
| return discoverySettings; | ||
| } | ||
|
|
||
| @Override | ||
| public void startInitialJoin() { | ||
| final ClusterStateTaskExecutor<DiscoveryNode> executor = | ||
| new ClusterStateTaskExecutor<DiscoveryNode>() { | ||
|
|
||
| @Override | ||
| public ClusterTasksResult<DiscoveryNode> execute( | ||
| final ClusterState current, | ||
| final List<DiscoveryNode> tasks) throws Exception { | ||
| assert tasks.size() == 1; | ||
| final DiscoveryNodes.Builder nodes = | ||
| DiscoveryNodes.builder(current.nodes()); | ||
| // always set the local node as master, there will not be other nodes | ||
| nodes.masterNodeId(localNode().getId()); | ||
| final ClusterState next = | ||
| ClusterState.builder(current).nodes(nodes).build(); | ||
| final ClusterTasksResult.Builder<DiscoveryNode> result = | ||
| ClusterTasksResult.builder(); | ||
| return result.successes(tasks).build(next); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean runOnlyOnMaster() { | ||
| return false; | ||
| } | ||
|
|
||
| }; | ||
| final ClusterStateTaskConfig config = ClusterStateTaskConfig.build(Priority.URGENT); | ||
| clusterService.submitStateUpdateTasks( | ||
| "single-node-start-initial-join", | ||
| Collections.singletonMap(localNode(), (s, e) -> {}), config, executor); | ||
| } | ||
|
|
||
| @Override | ||
| public int getMinimumMasterNodes() { | ||
| return 1; | ||
| } | ||
|
|
||
| @Override | ||
| protected void doStart() { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected void doStop() { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected void doClose() throws IOException { | ||
|
|
||
| } | ||
|
|
||
| } |
Oops, something went wrong.