2 files changed, 8 insertions, 0 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index 66e3b7a1e26..49c4d30075b 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -56,6 +56,7 @@ public class App implements ProcessMXBean {
         .addJavaOpts(String.format("-Dsonar.path.logs=%s", installation.logsDir().getAbsolutePath()))
         .setClassName("org.sonar.search.SearchServer")
         .addProperties(installation.props().rawProperties())
+        .addProperty(DefaultSettings.SONAR_NODE_NAME, installation.prop(DefaultSettings.SONAR_NODE_NAME, DefaultSettings.getNonSetNodeName()))
         .addClasspath(installation.starPath("lib/common"))
         .addClasspath(installation.starPath("lib/search"));
       if (elasticsearch.execute()) {
@@ -73,6 +74,7 @@ public class App implements ProcessMXBean {
               .addJavaOpts(String.format("-Dsonar.path.logs=%s", installation.logsDir().getAbsolutePath()))
               .setClassName("org.sonar.server.app.WebServer")
               .addProperties(installation.props().rawProperties())
+              .addProperty(DefaultSettings.SONAR_NODE_NAME, installation.prop(DefaultSettings.SONAR_NODE_NAME, DefaultSettings.getNonSetNodeName()))
               .addClasspath(installation.starPath("extensions/jdbc-driver/mysql"))
               .addClasspath(installation.starPath("extensions/jdbc-driver/mssql"))
               .addClasspath(installation.starPath("extensions/jdbc-driver/oracle"))
diff --git a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
index 7e3634c5423..e97619c4992 100644
--- a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
+++ b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
@@ -28,6 +28,12 @@ class DefaultSettings {
     // only static stuff
   }
 
+  static final String SONAR_NODE_NAME = "sonar.node.name";
+
+  static String getNonSetNodeName() {
+    return "sonar-" + System.currentTimeMillis();
+  }
+
   static final String SONAR_CLUSTER_MASTER = "sonar.cluster.master";
 
   static final String PATH_LOGS_KEY = "sonar.path.logs";