From 0c156ac0029007e559d5d486dd5f1775ab229dff Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Tue, 22 Jul 2014 08:32:48 +0200
Subject: [PATCH] Register needs to be done right after creation to block the
 process

---
 .../java/org/sonar/application/ForkProcesses.java     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sonar-application/src/main/java/org/sonar/application/ForkProcesses.java b/sonar-application/src/main/java/org/sonar/application/ForkProcesses.java
index bc6339d3f48..de46a32c8fe 100644
--- a/sonar-application/src/main/java/org/sonar/application/ForkProcesses.java
+++ b/sonar-application/src/main/java/org/sonar/application/ForkProcesses.java
@@ -39,6 +39,10 @@ public class ForkProcesses {
       esPort = String.valueOf(NetworkUtils.freePort());
       installation.setProp("sonar.es.node.port", esPort);
     }
+    String esCluster = installation.prop("sonar.es.cluster.name", null);
+    if(esCluster == null){
+      installation.setProp("sonar.es.cluster.name", "sonarqube");
+    }
     installation.setProp("sonar.es.type", "TRANSPORT");
 
     shutdownHook = new Thread(new Runnable() {
@@ -52,6 +56,8 @@ public class ForkProcesses {
 
     Runtime.getRuntime().addShutdownHook(shutdownHook);
 
+    monitor = new Monitor();
+
     elasticsearch = new ProcessWrapper(
       installation.homeDir().getAbsolutePath(),
       installation.prop("sonar.es.javaOpts", "-server -Xmx256m -Xms128m -Xss256k -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly"),
@@ -59,6 +65,7 @@ public class ForkProcesses {
       installation.props(),
       "ES",
       installation.starPath("lib/search"));
+    monitor.registerProcess(elasticsearch);
 
 
     server = new ProcessWrapper(
@@ -68,10 +75,8 @@ public class ForkProcesses {
       installation.props(),
       "SQ",
       installation.starPath("lib"));
-
-    monitor = new Monitor();
-    monitor.registerProcess(elasticsearch);
     monitor.registerProcess(server);
+
     monitor.start();
     try {
       monitor.join();
-- 
2.39.5