Skip to content

Commit 1d82a6d

Browse files
DaveCTurnerDaveCTurner
authored
Deprecate unused Zen1 settings (#38289)
Today the following settings in the `discovery.zen` namespace are still used: - `discovery.zen.no_master_block` - `discovery.zen.hosts_provider` - `discovery.zen.ping.unicast.concurrent_connects` - `discovery.zen.ping.unicast.hosts.resolve_timeout` - `discovery.zen.ping.unicast.hosts` This commit deprecates all other settings in this namespace so that they can be removed in the next major version.
1 parent 4561f42 commit 1d82a6d

File tree

17 files changed

+64
-74
lines changed

17 files changed

+64
-74
lines changed

‎plugins/discovery-azure-classic/src/test/java/org/elasticsearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java

Lines changed: 0 additions & 5 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.transport.TransportAddress;
3737
import org.elasticsearch.discovery.azure.classic.AzureUnicastHostsProvider;
38-
import org.elasticsearch.discovery.zen.ZenDiscovery;
3938
import org.elasticsearch.plugin.discovery.azure.classic.AzureDiscoveryPlugin;
4039
import org.elasticsearch.plugins.Plugin;
4140
import org.elasticsearch.test.ESIntegTestCase;
@@ -66,10 +65,6 @@ protected Settings nodeSettings(int nodeOrdinal) {
6665
.put(super.nodeSettings(nodeOrdinal))
6766
.put("discovery.zen.hosts_provider", "azure");
6867

69-
// Make the test run faster
70-
builder.put(ZenDiscovery.JOIN_TIMEOUT_SETTING.getKey(), "1s")
71-
.put(ZenDiscovery.PING_TIMEOUT_SETTING.getKey(), "500ms");
72-
7368
// We add a fake subscription_id to start mock compute service
7469
builder.put(Management.SUBSCRIPTION_ID_SETTING.getKey(), "fake")
7570
.put(Discovery.REFRESH_SETTING.getKey(), "5s")

‎plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoverTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.elasticsearch.cloud.gce.util.Access;
2727
import org.elasticsearch.cluster.node.DiscoveryNode;
2828
import org.elasticsearch.common.settings.Settings;
29-
import org.elasticsearch.discovery.zen.ZenDiscovery;
3029
import org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin;
3130
import org.elasticsearch.plugins.Plugin;
3231
import org.elasticsearch.test.ESIntegTestCase;
@@ -43,7 +42,6 @@
4342
import static java.util.Collections.singletonList;
4443
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout;
4544

46-
4745
@ESIntegTestCase.ClusterScope(supportsDedicatedMasters = false, numDataNodes = 0, numClientNodes = 0)
4846
public class GceDiscoverTests extends ESIntegTestCase {
4947

@@ -67,9 +65,6 @@ protected Settings nodeSettings(int nodeOrdinal) {
6765
.put("discovery.zen.hosts_provider", "gce")
6866
.put("cloud.gce.project_id", "test")
6967
.put("cloud.gce.zone", "test")
70-
// Make the test run faster
71-
.put(ZenDiscovery.JOIN_TIMEOUT_SETTING.getKey(), "1s")
72-
.put(ZenDiscovery.PING_TIMEOUT_SETTING.getKey(), "500ms")
7368
.build();
7469
}
7570

‎server/src/main/java/org/elasticsearch/cluster/coordination/DiscoveryUpgradeService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ public class DiscoveryUpgradeService {
7777
// how long to wait after activation before attempting to join a master or perform a bootstrap upgrade
7878
public static final Setting<TimeValue> BWC_PING_TIMEOUT_SETTING =
7979
Setting.timeSetting("discovery.zen.bwc_ping_timeout",
80-
PING_TIMEOUT_SETTING, TimeValue.timeValueMillis(1), Setting.Property.NodeScope);
80+
PING_TIMEOUT_SETTING, TimeValue.timeValueMillis(1), Setting.Property.NodeScope, Setting.Property.Deprecated);
8181

8282
// whether to try and bootstrap all the discovered Zen2 nodes when the last Zen1 node leaves the cluster.
8383
public static final Setting<Boolean> ENABLE_UNSAFE_BOOTSTRAPPING_ON_UPGRADE_SETTING =
84-
Setting.boolSetting("discovery.zen.unsafe_rolling_upgrades_enabled", true, Setting.Property.NodeScope);
84+
Setting.boolSetting("discovery.zen.unsafe_rolling_upgrades_enabled", true, Setting.Property.NodeScope, Setting.Property.Deprecated);
8585

8686
/**
8787
* Dummy {@link ElectMasterService} that is only used to choose the best 6.x master from the discovered nodes, ignoring the

‎server/src/main/java/org/elasticsearch/discovery/DiscoverySettings.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ public class DiscoverySettings {
4646
**/
4747
public static final Setting<TimeValue> PUBLISH_TIMEOUT_SETTING =
4848
Setting.positiveTimeSetting("discovery.zen.publish_timeout", TimeValue.timeValueSeconds(30),
49-
Property.Dynamic, Property.NodeScope);
49+
Property.Dynamic, Property.NodeScope, Property.Deprecated);
5050

5151
/**
5252
* sets the timeout for receiving enough acks for a specific cluster state and committing it. failing
5353
* to receive responses within this window will cause the cluster state change to be rejected.
5454
*/
5555
public static final Setting<TimeValue> COMMIT_TIMEOUT_SETTING =
56-
new Setting<>("discovery.zen.commit_timeout", (s) -> PUBLISH_TIMEOUT_SETTING.getRaw(s),
56+
new Setting<>("discovery.zen.commit_timeout", PUBLISH_TIMEOUT_SETTING::getRaw,
5757
(s) -> TimeValue.parseTimeValue(s, TimeValue.timeValueSeconds(30), "discovery.zen.commit_timeout"),
58-
Property.Dynamic, Property.NodeScope);
58+
Property.Dynamic, Property.NodeScope, Property.Deprecated);
5959
public static final Setting<ClusterBlock> NO_MASTER_BLOCK_SETTING =
6060
new Setting<>("discovery.zen.no_master_block", "write", DiscoverySettings::parseNoMasterBlock,
6161
Property.Dynamic, Property.NodeScope);
6262
public static final Setting<Boolean> PUBLISH_DIFF_ENABLE_SETTING =
63-
Setting.boolSetting("discovery.zen.publish_diff.enable", true, Property.Dynamic, Property.NodeScope);
63+
Setting.boolSetting("discovery.zen.publish_diff.enable", true, Property.Dynamic, Property.NodeScope, Property.Deprecated);
6464
public static final Setting<TimeValue> INITIAL_STATE_TIMEOUT_SETTING =
6565
Setting.positiveTimeSetting("discovery.initial_state_timeout", TimeValue.timeValueSeconds(30), Property.NodeScope);
6666

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ public abstract class FaultDetection implements Closeable {
4545
private static final Logger logger = LogManager.getLogger(FaultDetection.class);
4646

4747
public static final Setting<Boolean> CONNECT_ON_NETWORK_DISCONNECT_SETTING =
48-
Setting.boolSetting("discovery.zen.fd.connect_on_network_disconnect", false, Property.NodeScope);
48+
Setting.boolSetting("discovery.zen.fd.connect_on_network_disconnect", false, Property.NodeScope, Property.Deprecated);
4949
public static final Setting<TimeValue> PING_INTERVAL_SETTING =
50-
Setting.positiveTimeSetting("discovery.zen.fd.ping_interval", timeValueSeconds(1), Property.NodeScope);
50+
Setting.positiveTimeSetting("discovery.zen.fd.ping_interval", timeValueSeconds(1), Property.NodeScope, Property.Deprecated);
5151
public static final Setting<TimeValue> PING_TIMEOUT_SETTING =
52-
Setting.timeSetting("discovery.zen.fd.ping_timeout", timeValueSeconds(30), Property.NodeScope);
52+
Setting.timeSetting("discovery.zen.fd.ping_timeout", timeValueSeconds(30), Property.NodeScope, Property.Deprecated);
5353
public static final Setting<Integer> PING_RETRIES_SETTING =
54-
Setting.intSetting("discovery.zen.fd.ping_retries", 3, Property.NodeScope);
54+
Setting.intSetting("discovery.zen.fd.ping_retries", 3, Property.NodeScope, Property.Deprecated);
5555
public static final Setting<Boolean> REGISTER_CONNECTION_LISTENER_SETTING =
56-
Setting.boolSetting("discovery.zen.fd.register_connection_listener", true, Property.NodeScope);
56+
Setting.boolSetting("discovery.zen.fd.register_connection_listener", true, Property.NodeScope, Property.Deprecated);
5757

5858
protected final ThreadPool threadPool;
5959
protected final ClusterName clusterName;

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,24 @@ public class ZenDiscovery extends AbstractLifecycleComponent implements Discover
9696
public static final Setting<TimeValue> JOIN_TIMEOUT_SETTING =
9797
Setting.timeSetting("discovery.zen.join_timeout",
9898
settings -> TimeValue.timeValueMillis(PING_TIMEOUT_SETTING.get(settings).millis() * 20),
99-
TimeValue.timeValueMillis(0), Property.NodeScope);
99+
TimeValue.timeValueMillis(0), Property.NodeScope, Property.Deprecated);
100100
public static final Setting<Integer> JOIN_RETRY_ATTEMPTS_SETTING =
101-
Setting.intSetting("discovery.zen.join_retry_attempts", 3, 1, Property.NodeScope);
101+
Setting.intSetting("discovery.zen.join_retry_attempts", 3, 1, Property.NodeScope, Property.Deprecated);
102102
public static final Setting<TimeValue> JOIN_RETRY_DELAY_SETTING =
103-
Setting.positiveTimeSetting("discovery.zen.join_retry_delay", TimeValue.timeValueMillis(100), Property.NodeScope);
103+
Setting.positiveTimeSetting("discovery.zen.join_retry_delay", TimeValue.timeValueMillis(100),
104+
Property.NodeScope, Property.Deprecated);
104105
public static final Setting<Integer> MAX_PINGS_FROM_ANOTHER_MASTER_SETTING =
105-
Setting.intSetting("discovery.zen.max_pings_from_another_master", 3, 1, Property.NodeScope);
106+
Setting.intSetting("discovery.zen.max_pings_from_another_master", 3, 1, Property.NodeScope, Property.Deprecated);
106107
public static final Setting<Boolean> SEND_LEAVE_REQUEST_SETTING =
107-
Setting.boolSetting("discovery.zen.send_leave_request", true, Property.NodeScope);
108+
Setting.boolSetting("discovery.zen.send_leave_request", true, Property.NodeScope, Property.Deprecated);
108109
public static final Setting<TimeValue> MASTER_ELECTION_WAIT_FOR_JOINS_TIMEOUT_SETTING =
109110
Setting.timeSetting("discovery.zen.master_election.wait_for_joins_timeout",
110111
settings -> TimeValue.timeValueMillis(JOIN_TIMEOUT_SETTING.get(settings).millis() / 2), TimeValue.timeValueMillis(0),
111-
Property.NodeScope);
112+
Property.NodeScope, Property.Deprecated);
112113
public static final Setting<Boolean> MASTER_ELECTION_IGNORE_NON_MASTER_PINGS_SETTING =
113-
Setting.boolSetting("discovery.zen.master_election.ignore_non_master_pings", false, Property.NodeScope);
114+
Setting.boolSetting("discovery.zen.master_election.ignore_non_master_pings", false, Property.NodeScope, Property.Deprecated);
114115
public static final Setting<Integer> MAX_PENDING_CLUSTER_STATES_SETTING =
115-
Setting.intSetting("discovery.zen.publish.max_pending_cluster_states", 25, 1, Property.NodeScope);
116+
Setting.intSetting("discovery.zen.publish.max_pending_cluster_states", 25, 1, Property.NodeScope, Property.Deprecated);
116117

117118
public static final String DISCOVERY_REJOIN_ACTION_NAME = "internal:discovery/zen/rejoin";
118119

‎server/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.elasticsearch.action.support.master;
2-
31
/*
42
* Licensed to Elasticsearch under one or more contributor
53
* license agreements. See the NOTICE file distributed with
@@ -18,12 +16,11 @@
1816
* specific language governing permissions and limitations
1917
* under the License.
2018
*/
19+
package org.elasticsearch.action.support.master;
2120

2221
import org.elasticsearch.action.DocWriteResponse;
2322
import org.elasticsearch.action.index.IndexResponse;
2423
import org.elasticsearch.common.settings.Settings;
25-
import org.elasticsearch.discovery.DiscoverySettings;
26-
import org.elasticsearch.discovery.zen.FaultDetection;
2724
import org.elasticsearch.plugins.Plugin;
2825
import org.elasticsearch.test.ESIntegTestCase;
2926
import org.elasticsearch.test.discovery.TestZenDiscovery;
@@ -69,10 +66,7 @@ public void testMasterFailoverDuringIndexingWithMappingChanges() throws Throwabl
6966
logger.info("--> start 4 nodes, 3 master, 1 data");
7067

7168
final Settings sharedSettings = Settings.builder()
72-
.put(FaultDetection.PING_TIMEOUT_SETTING.getKey(), "1s") // for hitting simulated network failures quickly
73-
.put(FaultDetection.PING_RETRIES_SETTING.getKey(), "1") // for hitting simulated network failures quickly
7469
.put("cluster.join.timeout", "10s") // still long to induce failures but not too long so test won't time out
75-
.put(DiscoverySettings.PUBLISH_TIMEOUT_SETTING.getKey(), "1s") // <-- for hitting simulated network failures quickly
7670
.build();
7771

7872
internalCluster().setBootstrapMasterNodeIndex(2);

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.elasticsearch.common.Priority;
3333
import org.elasticsearch.common.settings.Settings;
3434
import org.elasticsearch.discovery.DiscoverySettings;
35-
import org.elasticsearch.discovery.zen.ZenDiscovery;
3635
import org.elasticsearch.index.query.QueryBuilders;
3736
import org.elasticsearch.plugins.Plugin;
3837
import org.elasticsearch.test.ESIntegTestCase;
@@ -75,7 +74,6 @@ public void testTwoNodesNoMasterBlock() throws Exception {
7574
internalCluster().setBootstrapMasterNodeIndex(1);
7675

7776
Settings settings = Settings.builder()
78-
.put(ZenDiscovery.PING_TIMEOUT_SETTING.getKey(), "200ms")
7977
.put("discovery.initial_state_timeout", "500ms")
8078
.build();
8179

@@ -208,7 +206,6 @@ public void testThreeNodesNoMasterBlock() throws Exception {
208206
internalCluster().setBootstrapMasterNodeIndex(2);
209207

210208
Settings settings = Settings.builder()
211-
.put(ZenDiscovery.PING_TIMEOUT_SETTING.getKey(), "1s")
212209
.put("discovery.initial_state_timeout", "500ms")
213210
.build();
214211

@@ -283,9 +280,7 @@ public void testCannotCommitStateThreeNodes() throws Exception {
283280
internalCluster().setBootstrapMasterNodeIndex(2);
284281

285282
Settings settings = Settings.builder()
286-
.put(ZenDiscovery.PING_TIMEOUT_SETTING.getKey(), "200ms")
287283
.put("discovery.initial_state_timeout", "500ms")
288-
.put(DiscoverySettings.COMMIT_TIMEOUT_SETTING.getKey(), "100ms") // speed things up
289284
.build();
290285

291286
internalCluster().startNodes(3, settings);

‎server/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.cluster.allocation;
2121

2222
import com.carrotsearch.hppc.ObjectIntHashMap;
23-
2423
import org.apache.logging.log4j.LogManager;
2524
import org.apache.logging.log4j.Logger;
2625
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
@@ -31,7 +30,6 @@
3130
import org.elasticsearch.cluster.routing.allocation.decider.AwarenessAllocationDecider;
3231
import org.elasticsearch.common.Priority;
3332
import org.elasticsearch.common.settings.Settings;
34-
import org.elasticsearch.discovery.zen.ZenDiscovery;
3533
import org.elasticsearch.test.ESIntegTestCase;
3634
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
3735

@@ -105,7 +103,6 @@ public void testAwarenessZones() throws Exception {
105103
Settings commonSettings = Settings.builder()
106104
.put(AwarenessAllocationDecider.CLUSTER_ROUTING_ALLOCATION_AWARENESS_FORCE_GROUP_SETTING.getKey() + "zone.values", "a,b")
107105
.put(AwarenessAllocationDecider.CLUSTER_ROUTING_ALLOCATION_AWARENESS_ATTRIBUTE_SETTING.getKey(), "zone")
108-
.put(ZenDiscovery.JOIN_TIMEOUT_SETTING.getKey(), "10s")
109106
.build();
110107

111108
logger.info("--> starting 4 nodes on different zones");

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.elasticsearch.common.Nullable;
3131
import org.elasticsearch.common.settings.Settings;
3232
import org.elasticsearch.common.unit.TimeValue;
33-
import org.elasticsearch.discovery.zen.FaultDetection;
3433
import org.elasticsearch.discovery.zen.UnicastZenPing;
3534
import org.elasticsearch.discovery.zen.ZenPing;
3635
import org.elasticsearch.plugins.Plugin;
@@ -132,15 +131,11 @@ protected void clearTemporalResponses() {
132131
}
133132

134133
static final Settings DEFAULT_SETTINGS = Settings.builder()
135-
.put(FaultDetection.PING_TIMEOUT_SETTING.getKey(), "1s") // for hitting simulated network failures quickly
136-
.put(FaultDetection.PING_RETRIES_SETTING.getKey(), "1") // for hitting simulated network failures quickly
137134
.put(LeaderChecker.LEADER_CHECK_TIMEOUT_SETTING.getKey(), "1s") // for hitting simulated network failures quickly
138135
.put(LeaderChecker.LEADER_CHECK_RETRY_COUNT_SETTING.getKey(), 1) // for hitting simulated network failures quickly
139136
.put(FollowersChecker.FOLLOWER_CHECK_TIMEOUT_SETTING.getKey(), "1s") // for hitting simulated network failures quickly
140137
.put(FollowersChecker.FOLLOWER_CHECK_RETRY_COUNT_SETTING.getKey(), 1) // for hitting simulated network failures quickly
141-
.put("discovery.zen.join_timeout", "10s") // still long to induce failures but to long so test won't time out
142138
.put(JoinHelper.JOIN_TIMEOUT_SETTING.getKey(), "10s") // still long to induce failures but to long so test won't time out
143-
.put(DiscoverySettings.PUBLISH_TIMEOUT_SETTING.getKey(), "1s") // <-- for hitting simulated network failures quickly
144139
.put(Coordinator.PUBLISH_TIMEOUT_SETTING.getKey(), "1s") // <-- for hitting simulated network failures quickly
145140
.put(TransportSettings.CONNECT_TIMEOUT.getKey(), "10s") // Network delay disruption waits for the min between this
146141
// value and the time of disruption and does not recover immediately

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -388,13 +388,9 @@ public boolean validateClusterForming() {
388388
* Test for https://github.com/elastic/elasticsearch/issues/11665
389389
*/
390390
public void testIndicesDeleted() throws Exception {
391-
final Settings settings = Settings.builder()
392-
.put(DiscoverySettings.PUBLISH_TIMEOUT_SETTING.getKey(), "0s") // don't wait on isolated data node
393-
.put(DiscoverySettings.COMMIT_TIMEOUT_SETTING.getKey(), "30s") // wait till cluster state is committed
394-
.build();
395391
final String idxName = "test";
396-
final List<String> allMasterEligibleNodes = internalCluster().startMasterOnlyNodes(2, settings);
397-
final String dataNode = internalCluster().startDataOnlyNode(settings);
392+
final List<String> allMasterEligibleNodes = internalCluster().startMasterOnlyNodes(2);
393+
final String dataNode = internalCluster().startDataOnlyNode();
398394
ensureStableCluster(3);
399395
assertAcked(prepareCreate("test"));
400396

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ protected Settings nodeSettings(int nodeOrdinal) {
7171
return Settings.builder().put(super.nodeSettings(nodeOrdinal))
7272
.put(AbstractDisruptionTestCase.DEFAULT_SETTINGS)
7373
.put(TestZenDiscovery.USE_MOCK_PINGS.getKey(), false)
74-
.put(DiscoverySettings.COMMIT_TIMEOUT_SETTING.getKey(), "30s")
7574
.build();
7675
}
7776

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,12 @@ public void onNodeFailure(DiscoveryNode node, String reason) {
223223
}
224224

225225
assertThat(failureReason[0], matcher);
226+
227+
assertWarnings(
228+
"[discovery.zen.fd.connect_on_network_disconnect] setting was deprecated in Elasticsearch and will be removed in a future " +
229+
"release! See the breaking changes documentation for the next major version.",
230+
"[discovery.zen.fd.ping_interval] setting was deprecated in Elasticsearch and will be removed in a future " +
231+
"release! See the breaking changes documentation for the next major version.");
226232
}
227233

228234
public void testMasterFaultDetectionConnectOnDisconnect() throws InterruptedException {
@@ -262,6 +268,12 @@ public void testMasterFaultDetectionConnectOnDisconnect() throws InterruptedExce
262268
}
263269

264270
assertThat(failureReason[0], matcher);
271+
272+
assertWarnings(
273+
"[discovery.zen.fd.connect_on_network_disconnect] setting was deprecated in Elasticsearch and will be removed in a future " +
274+
"release! See the breaking changes documentation for the next major version.",
275+
"[discovery.zen.fd.ping_interval] setting was deprecated in Elasticsearch and will be removed in a future " +
276+
"release! See the breaking changes documentation for the next major version.");
265277
}
266278

267279
public void testMasterFaultDetectionNotSizeLimited() throws InterruptedException {
@@ -301,6 +313,12 @@ public void testMasterFaultDetectionNotSizeLimited() throws InterruptedException
301313
assertThat(inFlightRequestsBreaker.getTrippedCount(), equalTo(0L));
302314
assertThat(pingProbeA.completedPings(), greaterThanOrEqualTo(minExpectedPings));
303315
assertThat(pingProbeB.completedPings(), greaterThanOrEqualTo(minExpectedPings));
316+
317+
assertWarnings(
318+
"[discovery.zen.fd.connect_on_network_disconnect] setting was deprecated in Elasticsearch and will be removed in a future " +
319+
"release! See the breaking changes documentation for the next major version.",
320+
"[discovery.zen.fd.ping_interval] setting was deprecated in Elasticsearch and will be removed in a future " +
321+
"release! See the breaking changes documentation for the next major version.");
304322
}
305323

306324
private static class PingProbe extends MockTransportService.Tracer {

0 commit comments

Comments
 (0)