Skip to content

Commit 81c443c

Browse files
DaveCTurnerDaveCTurner
authored
Deprecate minimum_master_nodes (#37868)
Today we pass `discovery.zen.minimum_master_nodes` to nodes started up in tests, but for 7.x nodes this setting is not required as it has no effect. This commit removes this setting so that nodes are started with more realistic configurations, and deprecates it.
1 parent 6a78b6a commit 81c443c

File tree

23 files changed

+140
-278
lines changed

23 files changed

+140
-278
lines changed

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -373,18 +373,15 @@ class ClusterFormationTasks {
373373
'path.repo' : "${node.sharedDir}/repo",
374374
'path.shared_data' : "${node.sharedDir}/",
375375
// Define a node attribute so we can test that it exists
376-
'node.attr.testattr' : 'test'
376+
'node.attr.testattr' : 'test',
377+
// Don't wait for state, just start up quickly. This will also allow new and old nodes in the BWC case to become the master
378+
'discovery.initial_state_timeout' : '0s'
377379
]
378380
int minimumMasterNodes = node.config.minimumMasterNodes.call()
379-
if (minimumMasterNodes > 0) {
381+
if (node.nodeVersion.before("7.0.0") && minimumMasterNodes > 0) {
380382
esConfig['discovery.zen.minimum_master_nodes'] = minimumMasterNodes
381383
}
382-
if (minimumMasterNodes > 1) {
383-
// don't wait for state.. just start up quickly
384-
// this will also allow new and old nodes in the BWC case to become the master
385-
esConfig['discovery.initial_state_timeout'] = '0s'
386-
}
387-
if (esConfig.containsKey('discovery.zen.master_election.wait_for_joins_timeout') == false) {
384+
if (node.nodeVersion.before("7.0.0") && esConfig.containsKey('discovery.zen.master_election.wait_for_joins_timeout') == false) {
388385
// If a node decides to become master based on partial information from the pinging, don't let it hang for 30 seconds to correct
389386
// its mistake. Instead, only wait 5s to do another round of pinging.
390387
// This is necessary since we use 30s as the default timeout in REST requests waiting for cluster formation

‎docs/reference/migration/migrate_7_0/discovery.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ settings summary>> for an example, and the
1313
<<modules-discovery-bootstrap-cluster,cluster bootstrapping reference
1414
documentation>> describes this setting in more detail.
1515

16-
The `discovery.zen.minimum_master_nodes` setting is required during a rolling
17-
upgrade from 6.x, but can be removed in all other circumstances.
16+
The `discovery.zen.minimum_master_nodes` setting is permitted, but ignored, on
17+
7.x nodes.
1818

1919
[float]
2020
==== Removing master-eligible nodes sometimes requires voting exclusions

‎modules/transport-netty4/src/test/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
import org.elasticsearch.cluster.routing.UnassignedInfo;
3434
import org.elasticsearch.common.Priority;
3535
import org.elasticsearch.common.settings.Settings;
36-
import org.elasticsearch.common.settings.Settings.Builder;
3736
import org.elasticsearch.common.unit.TimeValue;
38-
import org.elasticsearch.discovery.zen.ElectMasterService;
3937
import org.elasticsearch.http.HttpServerTransport;
4038
import org.elasticsearch.test.ESIntegTestCase;
4139
import org.elasticsearch.test.InternalTestCluster;
@@ -58,11 +56,7 @@ public class Zen2RestApiIT extends ESNetty4IntegTestCase {
5856

5957
@Override
6058
protected Settings nodeSettings(int nodeOrdinal) {
61-
final Builder builder = Settings.builder().put(super.nodeSettings(nodeOrdinal))
62-
.put(TestZenDiscovery.USE_ZEN2.getKey(), true)
63-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE);
64-
65-
return builder.build();
59+
return Settings.builder().put(super.nodeSettings(nodeOrdinal)).put(TestZenDiscovery.USE_ZEN2.getKey(), true).build();
6660
}
6761

6862
@Override

‎plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222

2323
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;
24+
import org.elasticsearch.common.UUIDs;
2425
import org.elasticsearch.common.settings.Settings;
2526
import org.elasticsearch.discovery.DiscoveryModule;
2627
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
@@ -41,13 +42,14 @@ public void testMinimumMasterNodesStart() {
4142
.build();
4243
internalCluster().startNode(nodeSettings);
4344

44-
// We try to update minimum_master_nodes now
45-
ClusterUpdateSettingsResponse response = client().admin().cluster().prepareUpdateSettings()
46-
.setPersistentSettings(Settings.builder().put("discovery.zen.minimum_master_nodes", 1))
47-
.setTransientSettings(Settings.builder().put("discovery.zen.minimum_master_nodes", 1))
45+
// We try to update a setting now
46+
final String expectedValue = UUIDs.randomBase64UUID(random());
47+
final String settingName = "cluster.routing.allocation.exclude.any_attribute";
48+
final ClusterUpdateSettingsResponse response = client().admin().cluster().prepareUpdateSettings()
49+
.setPersistentSettings(Settings.builder().put(settingName, expectedValue))
4850
.get();
4951

50-
Integer min = response.getPersistentSettings().getAsInt("discovery.zen.minimum_master_nodes", null);
51-
assertThat(min, is(1));
52+
final String value = response.getPersistentSettings().get(settingName);
53+
assertThat(value, is(expectedValue));
5254
}
5355
}

‎qa/logging-config/src/test/java/org/elasticsearch/qa/custom_logging/CustomLoggingConfigIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* The intention is to confirm that users can still run their Elasticsearch instances with previous configurations.
4141
*/
4242
public class CustomLoggingConfigIT extends ESRestTestCase {
43-
private static final String NODE_STARTED = ".*node-0.*cluster.uuid.*node.id.*started.*";
43+
private static final String NODE_STARTED = ".*node-0.*cluster.uuid.*node.id.*recovered.*cluster_state.*";
4444

4545
public void testSuccessfulStartupWithCustomConfig() throws Exception {
4646
assertBusy(() -> {

‎qa/rolling-upgrade/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ for (Version version : bwcVersions.wireCompatible) {
7777
dependsOn lastRunner, "${baseName}#oldClusterTestCluster#node${stopNode}.stop"
7878
clusterName = 'rolling-upgrade'
7979
otherUnicastHostAddresses = { getOtherUnicastHostAddresses() }
80-
minimumMasterNodes = { 2 }
8180
autoSetInitialMasterNodes = false
8281
/* Override the data directory so the new node always gets the node we
8382
* just stopped's data directory. */

‎rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
cluster.put_settings:
55
body:
66
transient:
7-
discovery.zen.minimum_master_nodes: 1
7+
cluster.routing.allocation.enable: "none"
88
flat_settings: true
99

10-
- match: {transient: {discovery.zen.minimum_master_nodes: "1"}}
10+
- match: {transient: {cluster.routing.allocation.enable: "none"}}
1111

1212
- do:
1313
cluster.get_settings:
1414
flat_settings: true
1515

16-
- match: {transient: {discovery.zen.minimum_master_nodes: "1"}}
16+
- match: {transient: {cluster.routing.allocation.enable: "none"}}
1717

1818
- do:
1919
cluster.put_settings:
2020
body:
2121
transient:
22-
discovery.zen.minimum_master_nodes: null
22+
cluster.routing.allocation.enable: null
2323
flat_settings: true
2424

2525
- match: {transient: {}}
@@ -35,22 +35,22 @@
3535
cluster.put_settings:
3636
body:
3737
persistent:
38-
cluster.routing.allocation.disk.threshold_enabled: false
38+
cluster.routing.allocation.enable: "none"
3939
flat_settings: true
4040

41-
- match: {persistent: {cluster.routing.allocation.disk.threshold_enabled: "false"}}
41+
- match: {persistent: {cluster.routing.allocation.enable: "none"}}
4242

4343
- do:
4444
cluster.get_settings:
4545
flat_settings: true
4646

47-
- match: {persistent: {cluster.routing.allocation.disk.threshold_enabled: "false"}}
47+
- match: {persistent: {cluster.routing.allocation.enable: "none"}}
4848

4949
- do:
5050
cluster.put_settings:
5151
body:
5252
persistent:
53-
cluster.routing.allocation.disk.threshold_enabled: null
53+
cluster.routing.allocation.enable: null
5454
flat_settings: true
5555

5656
- match: {persistent: {}}

‎server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class ElectMasterService {
4242
private static final Logger logger = LogManager.getLogger(ElectMasterService.class);
4343

4444
public static final Setting<Integer> DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING =
45-
Setting.intSetting("discovery.zen.minimum_master_nodes", -1, Property.Dynamic, Property.NodeScope);
45+
Setting.intSetting("discovery.zen.minimum_master_nodes", -1, Property.Dynamic, Property.NodeScope, Property.Deprecated);
4646

4747
private volatile int minimumMasterNodes;
4848

‎server/src/test/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.common.settings.Settings;
2424
import org.elasticsearch.common.unit.TimeValue;
2525
import org.elasticsearch.discovery.MasterNotDiscoveredException;
26-
import org.elasticsearch.discovery.zen.ElectMasterService;
2726
import org.elasticsearch.gateway.GatewayService;
2827
import org.elasticsearch.test.ESIntegTestCase;
2928
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
@@ -51,8 +50,7 @@ protected List<Settings> addExtraClusterBootstrapSettings(List<Settings> allNode
5150

5251
public void testIndexExistsWithBlocksInPlace() throws IOException {
5352
Settings settings = Settings.builder()
54-
.put(GatewayService.RECOVER_AFTER_NODES_SETTING.getKey(), 99)
55-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE).build();
53+
.put(GatewayService.RECOVER_AFTER_NODES_SETTING.getKey(), 99).build();
5654
String node = internalCluster().startNode(settings);
5755

5856
assertThrows(client(node).admin().indices().prepareExists("test").setMasterNodeTimeout(TimeValue.timeValueSeconds(0)),

‎server/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
2727
import org.elasticsearch.client.Client;
2828
import org.elasticsearch.cluster.coordination.ClusterBootstrapService;
29+
import org.elasticsearch.cluster.coordination.FailedToCommitClusterStateException;
2930
import org.elasticsearch.cluster.metadata.MetaData;
3031
import org.elasticsearch.cluster.node.DiscoveryNode;
3132
import org.elasticsearch.cluster.service.ClusterService;
3233
import org.elasticsearch.common.Priority;
3334
import org.elasticsearch.common.settings.Settings;
3435
import org.elasticsearch.discovery.DiscoverySettings;
35-
import org.elasticsearch.cluster.coordination.FailedToCommitClusterStateException;
36-
import org.elasticsearch.discovery.zen.ElectMasterService;
3736
import org.elasticsearch.discovery.zen.ZenDiscovery;
3837
import org.elasticsearch.index.query.QueryBuilders;
3938
import org.elasticsearch.node.Node;
@@ -102,7 +101,6 @@ public void testTwoNodesNoMasterBlock() throws Exception {
102101
bootstrapNodeId = 2;
103102

104103
Settings settings = Settings.builder()
105-
.put("discovery.zen.minimum_master_nodes", 2)
106104
.put(ZenDiscovery.PING_TIMEOUT_SETTING.getKey(), "200ms")
107105
.put("discovery.initial_state_timeout", "500ms")
108106
.build();
@@ -237,7 +235,6 @@ public void testThreeNodesNoMasterBlock() throws Exception {
237235
bootstrapNodeId = 3;
238236

239237
Settings settings = Settings.builder()
240-
.put("discovery.zen.minimum_master_nodes", 3)
241238
.put(ZenDiscovery.PING_TIMEOUT_SETTING.getKey(), "1s")
242239
.put("discovery.initial_state_timeout", "500ms")
243240
.build();
@@ -316,11 +313,9 @@ public void testCannotCommitStateThreeNodes() throws Exception {
316313
Settings settings = Settings.builder()
317314
.put(ZenDiscovery.PING_TIMEOUT_SETTING.getKey(), "200ms")
318315
.put("discovery.initial_state_timeout", "500ms")
319-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), 2)
320316
.put(DiscoverySettings.COMMIT_TIMEOUT_SETTING.getKey(), "100ms") // speed things up
321317
.build();
322318

323-
324319
internalCluster().startNodes(3, settings);
325320
ensureGreen(); // ensure cluster state is recovered before we disrupt things
326321

‎server/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.util.Collections;
3939
import java.util.List;
4040

41-
import static org.elasticsearch.discovery.zen.ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING;
4241
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
4342
import static org.hamcrest.Matchers.equalTo;
4443
import static org.hamcrest.Matchers.nullValue;
@@ -47,12 +46,6 @@
4746
@TestLogging("_root:DEBUG,org.elasticsearch.action.admin.cluster.state:TRACE")
4847
public class SpecificMasterNodesIT extends ESIntegTestCase {
4948

50-
@Override
51-
protected Settings nodeSettings(int nodeOrdinal) {
52-
return Settings.builder().put(super.nodeSettings(nodeOrdinal))
53-
.put(DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), 1).build();
54-
}
55-
5649
@Override
5750
protected List<Settings> addExtraClusterBootstrapSettings(List<Settings> allNodesSettings) {
5851
// if it's the first master in the cluster bootstrap the cluster with this node name

‎server/src/test/java/org/elasticsearch/cluster/coordination/UnsafeBootstrapMasterIT.java

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.cluster.metadata.MetaData;
2929
import org.elasticsearch.common.settings.Settings;
3030
import org.elasticsearch.discovery.DiscoverySettings;
31-
import org.elasticsearch.discovery.zen.ElectMasterService;
3231
import org.elasticsearch.env.Environment;
3332
import org.elasticsearch.env.NodeEnvironment;
3433
import org.elasticsearch.env.NodeMetaData;
@@ -155,7 +154,6 @@ public void testNoNodeMetaData() throws IOException {
155154
public void testNotBootstrappedCluster() throws Exception {
156155
internalCluster().startNode(
157156
Settings.builder()
158-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE)
159157
.put(DiscoverySettings.INITIAL_STATE_TIMEOUT_SETTING.getKey(), "0s") // to ensure quick node startup
160158
.build());
161159
assertBusy(() -> {
@@ -172,9 +170,7 @@ public void testNotBootstrappedCluster() throws Exception {
172170

173171
public void testNoManifestFile() throws IOException {
174172
bootstrapNodeId = 1;
175-
internalCluster().startNode(Settings.builder()
176-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE)
177-
.build());
173+
internalCluster().startNode();
178174
ensureStableCluster(1);
179175
NodeEnvironment nodeEnvironment = internalCluster().getMasterNodeInstance(NodeEnvironment.class);
180176
internalCluster().stopRandomDataNode();
@@ -186,9 +182,7 @@ public void testNoManifestFile() throws IOException {
186182

187183
public void testNoMetaData() throws IOException {
188184
bootstrapNodeId = 1;
189-
internalCluster().startNode(Settings.builder()
190-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE)
191-
.build());
185+
internalCluster().startNode();
192186
ensureStableCluster(1);
193187
NodeEnvironment nodeEnvironment = internalCluster().getMasterNodeInstance(NodeEnvironment.class);
194188
internalCluster().stopRandomDataNode();
@@ -201,9 +195,7 @@ public void testNoMetaData() throws IOException {
201195

202196
public void testAbortedByUser() throws IOException {
203197
bootstrapNodeId = 1;
204-
internalCluster().startNode(Settings.builder()
205-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE)
206-
.build());
198+
internalCluster().startNode();
207199
ensureStableCluster(1);
208200
internalCluster().stopRandomDataNode();
209201

@@ -213,13 +205,9 @@ public void testAbortedByUser() throws IOException {
213205

214206
public void test3MasterNodes2Failed() throws Exception {
215207
bootstrapNodeId = 3;
216-
List<String> masterNodes = internalCluster().startMasterOnlyNodes(3, Settings.builder()
217-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE)
218-
.build());
208+
List<String> masterNodes = internalCluster().startMasterOnlyNodes(3, Settings.EMPTY);
219209

220-
String dataNode = internalCluster().startDataOnlyNode(Settings.builder()
221-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE)
222-
.build());
210+
String dataNode = internalCluster().startDataOnlyNode();
223211
createIndex("test");
224212

225213
Client dataNodeClient = internalCluster().client(dataNode);
@@ -246,9 +234,7 @@ public void test3MasterNodes2Failed() throws Exception {
246234
String.format(Locale.ROOT, UnsafeBootstrapMasterCommand.CLUSTER_STATE_TERM_VERSION_MSG_FORMAT,
247235
metaData.coordinationMetaData().term(), metaData.version())));
248236

249-
internalCluster().startMasterOnlyNode(Settings.builder()
250-
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), Integer.MAX_VALUE)
251-
.build());
237+
internalCluster().startMasterOnlyNode();
252238

253239
assertBusy(() -> {
254240
ClusterState state = dataNodeClient.admin().cluster().prepareState().setLocal(true)

‎server/src/test/java/org/elasticsearch/cluster/coordination/Zen1IT.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.elasticsearch.common.Priority;
3535
import org.elasticsearch.common.settings.Settings;
3636
import org.elasticsearch.common.unit.TimeValue;
37+
import org.elasticsearch.discovery.zen.ElectMasterService;
3738
import org.elasticsearch.env.NodeEnvironment;
3839
import org.elasticsearch.gateway.MetaStateService;
3940
import org.elasticsearch.test.ESIntegTestCase;
@@ -50,6 +51,7 @@
5051
import static org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider.CLUSTER_ROUTING_ALLOCATION_ENABLE_SETTING;
5152
import static org.elasticsearch.cluster.routing.allocation.decider.FilterAllocationDecider.CLUSTER_ROUTING_EXCLUDE_GROUP_SETTING;
5253
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
54+
import static org.elasticsearch.test.InternalTestCluster.REMOVED_MINIMUM_MASTER_NODES;
5355
import static org.hamcrest.Matchers.equalTo;
5456
import static org.hamcrest.Matchers.is;
5557

@@ -194,7 +196,8 @@ public Settings onNodeStopped(String nodeName) {
194196
}
195197
ClusterHealthResponse clusterHealthResponse = clusterHealthRequestBuilder.get();
196198
assertFalse(nodeName, clusterHealthResponse.isTimedOut());
197-
return Coordinator.addZen1Attribute(false, Settings.builder().put(ZEN2_SETTINGS)).build();
199+
return Coordinator.addZen1Attribute(false, Settings.builder().put(ZEN2_SETTINGS)
200+
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), REMOVED_MINIMUM_MASTER_NODES)).build();
198201
}
199202
});
200203

@@ -289,6 +292,7 @@ public Settings onNodeStopped(String nodeName) throws Exception {
289292
return Coordinator.addZen1Attribute(false, Settings.builder())
290293
.put(ZEN2_SETTINGS)
291294
.putList(INITIAL_MASTER_NODES_SETTING.getKey(), nodeNames)
295+
.put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), REMOVED_MINIMUM_MASTER_NODES)
292296
.build();
293297
}
294298
});

‎server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.elasticsearch.common.settings.Settings;
3636
import org.elasticsearch.common.unit.TimeValue;
3737
import org.elasticsearch.common.xcontent.XContentType;
38-
import org.elasticsearch.discovery.zen.ElectMasterService;
3938
import org.elasticsearch.discovery.zen.ZenDiscovery;
4039
import org.elasticsearch.monitor.jvm.HotThreads;
4140
import org.elasticsearch.test.ESIntegTestCase;
@@ -125,11 +124,6 @@ public void testNodesFDAfterMasterReelection() throws Exception {
125124

126125
ensureStableCluster(3);
127126

128-
logger.info("--> reducing min master nodes to 2");
129-
assertAcked(client().admin().cluster().prepareUpdateSettings()
130-
.setTransientSettings(Settings.builder().put(ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), 2))
131-
.get());
132-
133127
String master = internalCluster().getMasterName();
134128
String nonMaster = null;
135129
for (String node : internalCluster().getNodeNames()) {
@@ -154,7 +148,7 @@ public void testNodesFDAfterMasterReelection() throws Exception {
154148
*/
155149
@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE,org.elasticsearch.test.disruption:TRACE")
156150
public void testStaleMasterNotHijackingMajority() throws Exception {
157-
// 3 node cluster with unicast discovery and minimum_master_nodes set to the default of 2:
151+
// 3 node cluster with unicast discovery:
158152
final List<String> nodes = startCluster(3);
159153

160154
// Save the current master node as old master node, because that node will get frozen

0 commit comments

Comments
 (0)