honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove string usages of old transport settings (#41207) 

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.
This commit is contained in:
Tim Brooks 2019-04-15 16:54:24 -06:00 committed by GitHub
parent 7e59794ced
commit 56c00eecbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
View File

@ -412,7 +412,11 @@ class ClusterFormationTasks {
} }
esConfig['node.max_local_storage_nodes'] = node.config.numNodes esConfig['node.max_local_storage_nodes'] = node.config.numNodes
esConfig['http.port'] = node.config.httpPort 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 // 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.low'] = '1b'
esConfig['cluster.routing.allocation.disk.watermark.high'] = '1b' esConfig['cluster.routing.allocation.disk.watermark.high'] = '1b'

6
buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
View File

@ -605,7 +605,11 @@ public class ElasticsearchNode implements TestClusterConfiguration {
defaultConfig.put("node.attr.testattr", "test"); defaultConfig.put("node.attr.testattr", "test");
defaultConfig.put("node.portsfile", "true"); defaultConfig.put("node.portsfile", "true");
defaultConfig.put("http.port", "0"); defaultConfig.put("http.port", "0");
defaultConfig.put("transport.tcp.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 // 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.low", "1b");
defaultConfig.put("cluster.routing.allocation.disk.watermark.high", "1b"); defaultConfig.put("cluster.routing.allocation.disk.watermark.high", "1b");

2
server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java
View File

@ -59,7 +59,7 @@ public class SingleNodeDiscoveryIT extends ESIntegTestCase {
.builder() .builder()
.put(super.nodeSettings(nodeOrdinal)) .put(super.nodeSettings(nodeOrdinal))
.put("discovery.type", "single-node") .put("discovery.type", "single-node")
.put("transport.tcp.port", "0") .put("transport.port", "0")
.build(); .build();
} }

2
x-pack/qa/vagrant/src/test/resources/packaging/tests/certgen.bash
View File

@ -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.http.ssl.certificate_authorities: ["$ESCONFIG/certs/ca/ca.crt"]
xpack.security.transport.ssl.enabled: true xpack.security.transport.ssl.enabled: true
transport.tcp.port: 9300 transport.port: 9300
xpack.security.http.ssl.enabled: true xpack.security.http.ssl.enabled: true
http.port: 9200 http.port: 9200