From 94278218101b456e88729de465bf21e3ed5b0aa1 Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Wed, 3 Apr 2019 15:50:13 -0600 Subject: [PATCH 1/2] Remove string usages of old transport settings This is related to #36652. We intend to deprecate a number of transport settings in 7.x and remove them in 8.0. This commit removes the string usages of these settings. --- .../elasticsearch/gradle/test/ClusterFormationTasks.groovy | 6 +++++- .../gradle/testclusters/ElasticsearchNode.java | 2 +- .../sniffer/src/test/resources/create_test_nodes_info.bash | 2 +- .../discovery/single/SingleNodeDiscoveryIT.java | 2 +- .../vagrant/src/test/resources/packaging/tests/certgen.bash | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy index fccb190bcc38d..bc5999bc60773 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy @@ -384,7 +384,11 @@ class ClusterFormationTasks { ] esConfig['node.max_local_storage_nodes'] = node.config.numNodes esConfig['http.port'] = node.config.httpPort - esConfig['transport.tcp.port'] = node.config.transportPort + if (node.nodeVersion.onOrAfter('6.7.0')) { + esConfig['transport.port'] = node.config.transportPort + } else { + esConfig['transport.tcp.port'] = node.config.transportPort + } // Default the watermarks to absurdly low to prevent the tests from failing on nodes without enough disk space esConfig['cluster.routing.allocation.disk.watermark.low'] = '1b' esConfig['cluster.routing.allocation.disk.watermark.high'] = '1b' diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java index 4138131d7a150..44813ab7be840 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java @@ -550,7 +550,7 @@ private void createConfiguration() { defaultConfig.put("node.attr.testattr", "test"); defaultConfig.put("node.portsfile", "true"); defaultConfig.put("http.port", "0"); - defaultConfig.put("transport.tcp.port", "0"); + defaultConfig.put("transport.port", "0"); // Default the watermarks to absurdly low to prevent the tests from failing on nodes without enough disk space defaultConfig.put("cluster.routing.allocation.disk.watermark.low", "1b"); defaultConfig.put("cluster.routing.allocation.disk.watermark.high", "1b"); diff --git a/client/sniffer/src/test/resources/create_test_nodes_info.bash b/client/sniffer/src/test/resources/create_test_nodes_info.bash index f4f1c09882ea8..1b634d0bbf327 100644 --- a/client/sniffer/src/test/resources/create_test_nodes_info.bash +++ b/client/sniffer/src/test/resources/create_test_nodes_info.bash @@ -60,7 +60,7 @@ node${attr}.dummy: everyone_has_me node${attr}.number: ${node:1} node${attr}.array: [${node:0:1}, ${node:1}] http.port: ${http_port} -transport.tcp.port: ${transport_port} +transport.port: ${transport_port} discovery.zen.minimum_master_nodes: 3 discovery.zen.ping.unicast.hosts: ['localhost:9300','localhost:9301','localhost:9302'] __ES_YML diff --git a/server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java b/server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java index e0fc4a4d5392c..e0177af1bed39 100644 --- a/server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java +++ b/server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java @@ -59,7 +59,7 @@ protected Settings nodeSettings(int nodeOrdinal) { .builder() .put(super.nodeSettings(nodeOrdinal)) .put("discovery.type", "single-node") - .put("transport.tcp.port", "0") + .put("transport.port", "0") .build(); } diff --git a/x-pack/qa/vagrant/src/test/resources/packaging/tests/certgen.bash b/x-pack/qa/vagrant/src/test/resources/packaging/tests/certgen.bash index c0ae9aac4db30..13aed28b4c1ba 100644 --- a/x-pack/qa/vagrant/src/test/resources/packaging/tests/certgen.bash +++ b/x-pack/qa/vagrant/src/test/resources/packaging/tests/certgen.bash @@ -259,7 +259,7 @@ xpack.security.http.ssl.certificate: $ESCONFIG/certs/node-master/node-master.crt xpack.security.http.ssl.certificate_authorities: ["$ESCONFIG/certs/ca/ca.crt"] xpack.security.transport.ssl.enabled: true -transport.tcp.port: 9300 +transport.port: 9300 xpack.security.http.ssl.enabled: true http.port: 9200 From 2f557850246a3d47db875f4e9b1d911b6f09af59 Mon Sep 17 00:00:00 2001 From: Tim Brooks Date: Thu, 4 Apr 2019 09:43:55 -0600 Subject: [PATCH 2/2] Changes --- .../gradle/testclusters/ElasticsearchNode.java | 6 +++++- .../sniffer/src/test/resources/create_test_nodes_info.bash | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java index 85082d784cfd5..8883262d5537f 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java @@ -537,7 +537,11 @@ private void createConfiguration() { defaultConfig.put("node.attr.testattr", "test"); defaultConfig.put("node.portsfile", "true"); defaultConfig.put("http.port", "0"); - defaultConfig.put("transport.port", "0"); + if (Version.fromString(version).onOrAfter(Version.fromString("6.7.0"))) { + defaultConfig.put("transport.port", "0"); + } else { + defaultConfig.put("transport.tcp.port", "0"); + } // Default the watermarks to absurdly low to prevent the tests from failing on nodes without enough disk space defaultConfig.put("cluster.routing.allocation.disk.watermark.low", "1b"); defaultConfig.put("cluster.routing.allocation.disk.watermark.high", "1b"); diff --git a/client/sniffer/src/test/resources/create_test_nodes_info.bash b/client/sniffer/src/test/resources/create_test_nodes_info.bash index 1b634d0bbf327..f4f1c09882ea8 100644 --- a/client/sniffer/src/test/resources/create_test_nodes_info.bash +++ b/client/sniffer/src/test/resources/create_test_nodes_info.bash @@ -60,7 +60,7 @@ node${attr}.dummy: everyone_has_me node${attr}.number: ${node:1} node${attr}.array: [${node:0:1}, ${node:1}] http.port: ${http_port} -transport.port: ${transport_port} +transport.tcp.port: ${transport_port} discovery.zen.minimum_master_nodes: 3 discovery.zen.ping.unicast.hosts: ['localhost:9300','localhost:9301','localhost:9302'] __ES_YML