From 6390f55dcf651f5c9c7a0fb1e54a2ec8594f8940 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 10 Jan 2020 09:07:39 +0100 Subject: [PATCH] SONAR-12686 replace deprecated setting transport.tcp.port by transport.port --- .../org/sonar/application/command/CommandFactoryImpl.java | 2 +- .../src/main/java/org/sonar/application/es/EsSettings.java | 4 +++- .../test/java/org/sonar/application/es/EsSettingsTest.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/sonar-main/src/main/java/org/sonar/application/command/CommandFactoryImpl.java b/server/sonar-main/src/main/java/org/sonar/application/command/CommandFactoryImpl.java index 66c2f02672d..37cd0c6c31e 100644 --- a/server/sonar-main/src/main/java/org/sonar/application/command/CommandFactoryImpl.java +++ b/server/sonar-main/src/main/java/org/sonar/application/command/CommandFactoryImpl.java @@ -145,7 +145,7 @@ public class CommandFactoryImpl implements CommandFactory { .setEsYmlSettings(new EsYmlSettings(settingsMap)) .setClusterName(settingsMap.get("cluster.name")) .setHost(settingsMap.get("network.host")) - .setPort(Integer.parseInt(settingsMap.get("transport.tcp.port"))); + .setPort(Integer.parseInt(settingsMap.get("transport.port"))); return esInstallation; } diff --git a/server/sonar-main/src/main/java/org/sonar/application/es/EsSettings.java b/server/sonar-main/src/main/java/org/sonar/application/es/EsSettings.java index 78a20cf6d6d..a852fdf4efc 100644 --- a/server/sonar-main/src/main/java/org/sonar/application/es/EsSettings.java +++ b/server/sonar-main/src/main/java/org/sonar/application/es/EsSettings.java @@ -91,7 +91,9 @@ public class EsSettings { int port = Integer.parseInt(props.nonNullValue(SEARCH_PORT.getKey())); LOGGER.info("Elasticsearch listening on {}:{}", host, port); - builder.put("transport.tcp.port", valueOf(port)); + // FIXME no need to open TCP port unless running DCE + // TCP is used by main process to check ES is up => probably has to use HTTP now + builder.put("transport.port", valueOf(port)); builder.put("transport.host", valueOf(host.getHostAddress())); builder.put("network.host", valueOf(host.getHostAddress())); diff --git a/server/sonar-main/src/test/java/org/sonar/application/es/EsSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/es/EsSettingsTest.java index 275712e53d4..cfc7800d52e 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/es/EsSettingsTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/es/EsSettingsTest.java @@ -138,7 +138,7 @@ public class EsSettingsTest { EsSettings esSettings = new EsSettings(props, new EsInstallation(props), system); Map generated = esSettings.build(); - assertThat(generated.get("transport.tcp.port")).isEqualTo("1234"); + assertThat(generated.get("transport.port")).isEqualTo("1234"); assertThat(generated.get("transport.host")).isEqualTo("127.0.0.1"); // no cluster, but cluster and node names are set though -- 2.39.5