File tree 4 files changed +12
-4
lines changed
groovy/org/elasticsearch/gradle/test
java/org/elasticsearch/gradle/testclusters
server/src/test/java/org/elasticsearch/discovery/single
x-pack/qa/vagrant/src/test/resources/packaging/tests
4 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -412,7 +412,11 @@ class ClusterFormationTasks {
412
412
}
413
413
esConfig[' node.max_local_storage_nodes' ] = node. config. numNodes
414
414
esConfig[' http.port' ] = node. config. httpPort
415
- esConfig[' transport.tcp.port' ] = node. config. transportPort
415
+ if (node. nodeVersion. onOrAfter(' 6.7.0' )) {
416
+ esConfig[' transport.port' ] = node. config. transportPort
417
+ } else {
418
+ esConfig[' transport.tcp.port' ] = node. config. transportPort
419
+ }
416
420
// Default the watermarks to absurdly low to prevent the tests from failing on nodes without enough disk space
417
421
esConfig[' cluster.routing.allocation.disk.watermark.low' ] = ' 1b'
418
422
esConfig[' cluster.routing.allocation.disk.watermark.high' ] = ' 1b'
Original file line number Diff line number Diff line change @@ -605,7 +605,11 @@ private void createConfiguration() {
605
605
defaultConfig .put ("node.attr.testattr" , "test" );
606
606
defaultConfig .put ("node.portsfile" , "true" );
607
607
defaultConfig .put ("http.port" , "0" );
608
- defaultConfig .put ("transport.tcp.port" , "0" );
608
+ if (Version .fromString (version ).onOrAfter (Version .fromString ("6.7.0" ))) {
609
+ defaultConfig .put ("transport.port" , "0" );
610
+ } else {
611
+ defaultConfig .put ("transport.tcp.port" , "0" );
612
+ }
609
613
// Default the watermarks to absurdly low to prevent the tests from failing on nodes without enough disk space
610
614
defaultConfig .put ("cluster.routing.allocation.disk.watermark.low" , "1b" );
611
615
defaultConfig .put ("cluster.routing.allocation.disk.watermark.high" , "1b" );
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
59
59
.builder ()
60
60
.put (super .nodeSettings (nodeOrdinal ))
61
61
.put ("discovery.type" , "single-node" )
62
- .put ("transport.tcp. port" , "0" )
62
+ .put ("transport.port" , "0" )
63
63
.build ();
64
64
}
65
65
Original file line number Diff line number Diff line change @@ -259,7 +259,7 @@ xpack.security.http.ssl.certificate: $ESCONFIG/certs/node-master/node-master.crt
259
259
xpack.security.http.ssl.certificate_authorities: ["$ESCONFIG/certs/ca/ca.crt"]
260
260
261
261
xpack.security.transport.ssl.enabled: true
262
- transport.tcp. port: 9300
262
+ transport.port: 9300
263
263
264
264
xpack.security.http.ssl.enabled: true
265
265
http.port: 9200
You can’t perform that action at this time.
0 commit comments