SONAR-9741 populate default value of sonar.cluster.node.name

and propagate it through main process and sub processes

diff --git a/server/sonar-cluster/src/main/java/org/sonar/cluster/ClusterProperties.java b/server/sonar-cluster/src/main/java/org/sonar/cluster/ClusterProperties.java
index 018150341f82e6347126dd41dd5dbaedf7b6476f..ebbb86fd87566c28a064fb6933338539881ca52a 100644 (file)
--- a/server/sonar-cluster/src/main/java/org/sonar/cluster/ClusterProperties.java
+++ b/server/sonar-cluster/src/main/java/org/sonar/cluster/ClusterProperties.java
@@ -20,6 +20,7 @@
 package org.sonar.cluster;
 
 import java.util.Properties;
+import java.util.UUID;
 
 import static java.lang.String.valueOf;
 
@@ -49,6 +50,7 @@ public final class ClusterProperties {
     properties.put(CLUSTER_NODE_HOST, "");
     properties.put(CLUSTER_HOSTS, "");
     properties.put(CLUSTER_NODE_PORT, "9003");
+    properties.put(CLUSTER_NODE_NAME, "sonarqube-" + UUID.randomUUID().toString());
     properties.put(HAZELCAST_LOG_LEVEL, "WARN");
   }
 }

diff --git a/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
index a197b7bd4e06a640193e0b683455702569ce61b8..bb25b4f9a0b91df4ffc644b83c6d86fe8352f7d6 100644 (file)
--- a/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/ClusterProperties.java
@@ -26,7 +26,6 @@ import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
-import java.util.UUID;
 import javax.annotation.Nullable;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -56,10 +55,10 @@ final class ClusterProperties {
 
   ClusterProperties(AppSettings appSettings) {
     port = appSettings.getProps().valueAsInt(CLUSTER_NODE_PORT);
-    networkInterfaces = extractNetworkInterfaces(appSettings.getProps().value(CLUSTER_NODE_HOST, ""));
-    hosts = extractHosts(appSettings.getProps().value(CLUSTER_HOSTS, ""));
-    nodeType = NodeType.parse(appSettings.getProps().value(CLUSTER_NODE_TYPE));
-    nodeName = appSettings.getProps().value(CLUSTER_NODE_NAME, "sonarqube-" + UUID.randomUUID().toString());
+    networkInterfaces = extractNetworkInterfaces(appSettings.getProps().nonNullValue(CLUSTER_NODE_HOST));
+    hosts = extractHosts(appSettings.getProps().nonNullValue(CLUSTER_HOSTS));
+    nodeType = NodeType.parse(appSettings.getProps().nonNullValue(CLUSTER_NODE_TYPE));
+    nodeName = appSettings.getProps().nonNullValue(CLUSTER_NODE_NAME);
   }
 
   int getPort() {