Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove string usages of old transport settings #40818

Merged
merged 3 commits into from
Apr 4, 2019
Merged

Remove string usages of old transport settings #40818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9427821
Remove string usages of old transport settings
Tim-Brooks Apr 3, 2019
6067677
Merge remote-tracking branch 'upstream/master' into remove_string_usages
Tim-Brooks Apr 4, 2019
2f55785
Changes
Tim-Brooks Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 5 additions & 1 deletion buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
defaultConfig.put("cluster.routing.allocation.disk.watermark.low", "1b");
defaultConfig.put("cluster.routing.allocation.disk.watermark.high", "1b");
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/discovery/single/SingleNodeDiscoveryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion x-pack/qa/vagrant/src/test/resources/packaging/tests/certgen.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down