From bc2a9437f235e3b3c8d8614d3f0967f4b706b02e Mon Sep 17 00:00:00 2001 From: Andrey Ershov Date: Mon, 24 Dec 2018 14:36:59 +0100 Subject: [PATCH 1/2] Move InternalTestClusterTests to zen2 --- .../test/test/InternalTestClusterTests.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java index 52c599c89bac6..7273b6bd9bc35 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java @@ -61,8 +61,8 @@ import static org.elasticsearch.cluster.node.DiscoveryNode.Role.DATA; import static org.elasticsearch.cluster.node.DiscoveryNode.Role.INGEST; import static org.elasticsearch.cluster.node.DiscoveryNode.Role.MASTER; +import static org.elasticsearch.discovery.DiscoveryModule.DISCOVERY_HOSTS_PROVIDER_SETTING; import static org.elasticsearch.discovery.zen.ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING; -import static org.elasticsearch.test.discovery.TestZenDiscovery.USE_ZEN2; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFileExists; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFileNotExists; import static org.hamcrest.Matchers.equalTo; @@ -272,7 +272,7 @@ public Settings nodeSettings(int nodeOrdinal) { NodeEnvironment.MAX_LOCAL_STORAGE_NODES_SETTING.getKey(), 2 + (masterNodes ? InternalTestCluster.DEFAULT_HIGH_NUM_MASTER_NODES : 0) + maxNumDataNodes + numClientNodes) .put(NetworkModule.TRANSPORT_TYPE_KEY, getTestTransportType()) - .put(USE_ZEN2.getKey(), false) // full cluster restarts not yet supported + .putList(DISCOVERY_HOSTS_PROVIDER_SETTING.getKey(), "file") .build(); } @@ -384,7 +384,7 @@ public Settings nodeSettings(int nodeOrdinal) { // speedup join timeout as setting initial state timeout to 0 makes split // elections more likely .put(ZenDiscovery.JOIN_TIMEOUT_SETTING.getKey(), "3s") - .put(USE_ZEN2.getKey(), false) // full cluster restarts not yet supported + .putList(DISCOVERY_HOSTS_PROVIDER_SETTING.getKey(), "file") .build(); } @@ -408,10 +408,12 @@ public Settings transportClientSettings() { roles.add(role); } + final long masterCount = roles.stream().filter(role -> role == MASTER).count(); final Settings minMasterNodes = Settings.builder() - .put(DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), - roles.stream().filter(role -> role == MASTER).count() / 2 + 1 - ).build(); + .put(DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING.getKey(), masterCount / 2 + 1) + .put(INITIAL_MASTER_NODE_COUNT_SETTING.getKey(), masterCount) + .build(); + try { Map> pathsPerRole = new HashMap<>(); for (int i = 0; i < numNodes; i++) { @@ -467,7 +469,7 @@ public Settings nodeSettings(int nodeOrdinal) { return Settings.builder() .put(NodeEnvironment.MAX_LOCAL_STORAGE_NODES_SETTING.getKey(), 2) .put(NetworkModule.TRANSPORT_TYPE_KEY, getTestTransportType()) - .put(USE_ZEN2.getKey(), false) // full cluster restarts not yet supported + .putList(DISCOVERY_HOSTS_PROVIDER_SETTING.getKey(), "file") .build(); } From 0020eb3f485979f25a766cd9becaeb38bd6e36bb Mon Sep 17 00:00:00 2001 From: Andrey Ershov Date: Mon, 24 Dec 2018 16:43:43 +0100 Subject: [PATCH 2/2] disable port scan --- .../org/elasticsearch/test/test/InternalTestClusterTests.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java index 7273b6bd9bc35..74efa66637481 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java @@ -273,6 +273,7 @@ public Settings nodeSettings(int nodeOrdinal) { 2 + (masterNodes ? InternalTestCluster.DEFAULT_HIGH_NUM_MASTER_NODES : 0) + maxNumDataNodes + numClientNodes) .put(NetworkModule.TRANSPORT_TYPE_KEY, getTestTransportType()) .putList(DISCOVERY_HOSTS_PROVIDER_SETTING.getKey(), "file") + .putList(SettingsBasedHostsProvider.DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING.getKey()) .build(); } @@ -385,6 +386,7 @@ public Settings nodeSettings(int nodeOrdinal) { // elections more likely .put(ZenDiscovery.JOIN_TIMEOUT_SETTING.getKey(), "3s") .putList(DISCOVERY_HOSTS_PROVIDER_SETTING.getKey(), "file") + .putList(SettingsBasedHostsProvider.DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING.getKey()) .build(); } @@ -470,6 +472,7 @@ public Settings nodeSettings(int nodeOrdinal) { .put(NodeEnvironment.MAX_LOCAL_STORAGE_NODES_SETTING.getKey(), 2) .put(NetworkModule.TRANSPORT_TYPE_KEY, getTestTransportType()) .putList(DISCOVERY_HOSTS_PROVIDER_SETTING.getKey(), "file") + .putList(SettingsBasedHostsProvider.DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING.getKey()) .build(); }