Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Discovery] UnicastZenPing should also ping last known discoNodes
At the moment, when a node looses connection to the master (due to a partition or the master was stopped), we ping the unicast hosts in order to discover other nodes and elect a new master or get of another master than has been elected in the mean time. This can go wrong if all unicast targets are on the same side of a minority partition and therefore will never rejoin once the partition is healed. Closes #7336
- Loading branch information
Showing
8 changed files
with
201 additions
and
18 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
105 changes: 105 additions & 0 deletions
105
src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.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,105 @@ | ||
| /* | ||
| * 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.zen; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.common.settings.ImmutableSettings; | ||
| import org.elasticsearch.common.transport.DummyTransportAddress; | ||
| import org.elasticsearch.discovery.zen.elect.ElectMasterService; | ||
| import org.elasticsearch.test.ElasticsearchTestCase; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| public class ElectMasterServiceTest extends ElasticsearchTestCase { | ||
|
|
||
| ElectMasterService electMasterService() { | ||
| return new ElectMasterService(ImmutableSettings.EMPTY); | ||
| } | ||
|
|
||
| List<DiscoveryNode> generateRandomNodes() { | ||
| int count = scaledRandomIntBetween(1, 100); | ||
| ArrayList<DiscoveryNode> nodes = new ArrayList<>(count); | ||
|
|
||
| Map<String, String> master = new HashMap<>(); | ||
| master.put("master", "true"); | ||
| Map<String, String> nonMaster = new HashMap<>(); | ||
| nonMaster.put("master", "false"); | ||
|
|
||
| for (int i = 0; i < count; i++) { | ||
| Map<String, String> attributes = randomBoolean() ? master : nonMaster; | ||
| DiscoveryNode node = new DiscoveryNode("n_" + i, "n_" + i, DummyTransportAddress.INSTANCE, attributes, Version.CURRENT); | ||
| nodes.add(node); | ||
| } | ||
|
|
||
| Collections.shuffle(nodes, getRandom()); | ||
| return nodes; | ||
| } | ||
|
|
||
| @Test | ||
| public void sortByMasterLikelihood() { | ||
| List<DiscoveryNode> nodes = generateRandomNodes(); | ||
| List<DiscoveryNode> sortedNodes = electMasterService().sortByMasterLikelihood(nodes); | ||
| assertEquals(nodes.size(), sortedNodes.size()); | ||
| DiscoveryNode prevNode = sortedNodes.get(0); | ||
| for (int i = 1; i < sortedNodes.size(); i++) { | ||
| DiscoveryNode node = sortedNodes.get(i); | ||
| if (!prevNode.masterNode()) { | ||
| assertFalse(node.masterNode()); | ||
| } else if (node.masterNode()) { | ||
| assertTrue(prevNode.id().compareTo(node.id()) < 0); | ||
| } | ||
| prevNode = node; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void electMaster() { | ||
| List<DiscoveryNode> nodes = generateRandomNodes(); | ||
| ElectMasterService service = electMasterService(); | ||
| int min_master_nodes = randomIntBetween(0, nodes.size()); | ||
| service.minimumMasterNodes(min_master_nodes); | ||
|
|
||
| int master_nodes = 0; | ||
| for (DiscoveryNode node : nodes) { | ||
| if (node.masterNode()) { | ||
| master_nodes++; | ||
| } | ||
| } | ||
| DiscoveryNode master = null; | ||
| if (service.hasEnoughMasterNodes(nodes)) { | ||
| master = service.electMaster(nodes); | ||
| } | ||
|
|
||
| if (master_nodes == 0) { | ||
| assertNull(master); | ||
| } else if (min_master_nodes > 0 && master_nodes < min_master_nodes) { | ||
| assertNull(master); | ||
| } else { | ||
| for (DiscoveryNode node : nodes) { | ||
| if (node.masterNode()) { | ||
| assertTrue(master.id().compareTo(node.id()) <= 0); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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