SONAR-8798 start and monitor ES script from main process

server/sonar-process-monitor/src/main/java/org/sonar/application/SchedulerImpl.java

@@ -31,11 +31,13 @@
 import org.sonar.application.config.AppSettings;
 import org.sonar.application.config.ClusterSettings;
 import org.sonar.application.process.CommandFactory;
+import org.sonar.application.process.EsCommand;
 import org.sonar.application.process.JavaCommand;
 import org.sonar.application.process.ProcessLauncher;
 import org.sonar.application.process.Lifecycle;
 import org.sonar.application.process.ProcessEventListener;
 import org.sonar.application.process.ProcessLifecycleListener;
+import org.sonar.application.process.ProcessMonitor;
 import org.sonar.application.process.SQProcess;
 import org.sonar.process.ProcessId;
 
@@ -105,7 +107,7 @@ private void tryToStartAll() {
   private void tryToStartEs() {
     SQProcess process = processesById.get(ProcessId.ELASTICSEARCH);
     if (process != null) {
-      tryToStartProcess(process, commandFactory::createEsCommand);
+      tryToStartEsProcess(process, commandFactory::createEsCommand);
     }
   }
 
@@ -115,9 +117,9 @@ private void tryToStartWeb() {
       return;
     }
     if (appState.isOperational(ProcessId.WEB_SERVER, false)) {
-      tryToStartProcess(process, () -> commandFactory.createWebCommand(false));
+      tryToStartJavaProcess(process, () -> commandFactory.createWebCommand(false));
     } else if (appState.tryToLockWebLeader()) {
-      tryToStartProcess(process, () -> commandFactory.createWebCommand(true));
+      tryToStartJavaProcess(process, () -> commandFactory.createWebCommand(true));
     } else {
       Optional<String> leader = appState.getLeaderHostName();
       if (leader.isPresent()) {
@@ -131,7 +133,7 @@ private void tryToStartWeb() {
   private void tryToStartCe() {
     SQProcess process = processesById.get(ProcessId.COMPUTE_ENGINE);
     if (process != null && appState.isOperational(ProcessId.WEB_SERVER, false) && isEsClientStartable()) {
-      tryToStartProcess(process, commandFactory::createCeCommand);
+      tryToStartJavaProcess(process, commandFactory::createCeCommand);
     }
   }
 
@@ -140,12 +142,23 @@ private boolean isEsClientStartable() {
     return appState.isOperational(ProcessId.ELASTICSEARCH, requireLocalEs);
   }
 
-  private void tryToStartProcess(SQProcess process, Supplier<JavaCommand> commandSupplier) {
+  private void tryToStartJavaProcess(SQProcess process, Supplier<JavaCommand> commandSupplier) {
+    tryToStart(process, () -> {
+      JavaCommand command = commandSupplier.get();
+      return processLauncher.launch(command);
+    });
+  }
+
+  private void tryToStartEsProcess(SQProcess process, Supplier<EsCommand> commandSupplier) {
+    tryToStart(process, () -> {
+      EsCommand command = commandSupplier.get();
+      return processLauncher.launch(command);
+    });
+  }
+
+  private void tryToStart(SQProcess process, Supplier<ProcessMonitor> processMonitorSupplier) {
     try {
-      process.start(() -> {
-        JavaCommand command = commandSupplier.get();
-        return processLauncher.launch(command);
-      });
+      process.start(processMonitorSupplier);
     } catch (RuntimeException e) {
       // failed to start command -> stop everything
       terminate();

server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactory.java

@@ -21,7 +21,7 @@
 
 public interface CommandFactory {
 
-  JavaCommand createEsCommand();
+  EsCommand createEsCommand();
 
   JavaCommand createWebCommand(boolean leader);
 

server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java

@@ -19,14 +19,17 @@
  */
 package org.sonar.application.process;
 
+import java.io.File;
+import java.util.Map;
+import java.util.Optional;
 import org.sonar.application.config.AppSettings;
 import org.sonar.process.ProcessId;
 import org.sonar.process.ProcessProperties;
 
-import java.io.File;
-import java.util.Optional;
-
-import static org.sonar.process.ProcessProperties.*;
+import static org.sonar.process.ProcessProperties.HTTPS_PROXY_HOST;
+import static org.sonar.process.ProcessProperties.HTTPS_PROXY_PORT;
+import static org.sonar.process.ProcessProperties.HTTP_PROXY_HOST;
+import static org.sonar.process.ProcessProperties.HTTP_PROXY_PORT;
 
 public class CommandFactoryImpl implements CommandFactory {
   /**
@@ -49,15 +52,43 @@ public CommandFactoryImpl(AppSettings settings) {
   }
 
   @Override
-  public JavaCommand createEsCommand() {
+  public EsCommand createEsCommand() {
     File homeDir = settings.getProps().nonNullValueAsFile(ProcessProperties.PATH_HOME);
-    return newJavaCommand(ProcessId.ELASTICSEARCH, homeDir)
-      .addJavaOptions("-Djava.awt.headless=true")
-      .addJavaOptions(settings.getProps().nonNullValue(ProcessProperties.SEARCH_JAVA_OPTS))
-      .addJavaOptions(settings.getProps().nonNullValue(ProcessProperties.SEARCH_JAVA_ADDITIONAL_OPTS))
-      .setClassName("org.sonar.search.SearchServer")
-      .addClasspath("./lib/common/*")
-      .addClasspath("./lib/search/*");
+    File executable = new File(homeDir, getExecutable());
+    if (!executable.exists()) {
+      throw new IllegalStateException("Cannot find elasticsearch binary");
+    }
+
+    Map<String, String> settingsMap = new EsSettings(settings.getProps()).build();
+
+    EsCommand res = new EsCommand(ProcessId.ELASTICSEARCH)
+      .setWorkDir(executable.getParentFile().getParentFile())
+      .setExecutable(executable)
+      .setArguments(settings.getProps().rawProperties())
+      // TODO add argument to specify log4j configuration file
+      // TODO add argument to specify yaml configuration file
+      .setUrl("http://" + settingsMap.get("http.host") + ":" + settingsMap.get("http.port"));
+
+    settingsMap.entrySet().stream()
+      .filter(entry -> !"path.home".equals(entry.getKey()))
+      .forEach(entry -> res.addEsOption("-E" + entry.getKey() + "=" + entry.getValue()));
+
+    return res;
+
+    // FIXME quid of proxy settings and sonar.search.javaOpts/javaAdditionalOpts
+    // defaults of HTTPS are the same than HTTP defaults
+    // setSystemPropertyToDefaultIfNotSet(command, HTTPS_PROXY_HOST, HTTP_PROXY_HOST);
+    // setSystemPropertyToDefaultIfNotSet(command, HTTPS_PROXY_PORT, HTTP_PROXY_PORT);
+    // command
+    // .addJavaOptions(settings.getProps().nonNullValue(ProcessProperties.SEARCH_JAVA_OPTS))
+    // .addJavaOptions(settings.getProps().nonNullValue(ProcessProperties.SEARCH_JAVA_ADDITIONAL_OPTS));
+  }
+
+  private static String getExecutable() {
+    if (System.getProperty("os.name").startsWith("Windows")) {
+      return "elasticsearch/bin/elasticsearch.bat";
+    }
+    return "elasticsearch/bin/elasticsearch";
   }
 
   @Override

server/sonar-process-monitor/src/main/java/org/sonar/application/process/EsCommand.java

@@ -0,0 +1,64 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.application.process;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import org.sonar.process.ProcessId;
+
+public class EsCommand extends AbstractCommand<EsCommand> {
+  private File executable;
+  private String url;
+  private List<String> esOptions = new ArrayList<>();
+
+  public EsCommand(ProcessId id) {
+    super(id);
+  }
+
+  public File getExecutable() {
+    return executable;
+  }
+
+  public EsCommand setExecutable(File executable) {
+    this.executable = executable;
+    return this;
+  }
+
+  public String getUrl() {
+    return url;
+  }
+
+  public EsCommand setUrl(String url) {
+    this.url = url;
+    return this;
+  }
+
+  public List<String> getEsOptions() {
+    return esOptions;
+  }
+
+  public EsCommand addEsOption(String s) {
+    if (!s.isEmpty()) {
+      esOptions.add(s);
+    }
+    return this;
+  }
+}

server/sonar-process-monitor/src/main/java/org/sonar/application/process/EsProcessMonitor.java

@@ -0,0 +1,119 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonar.application.process;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EsProcessMonitor extends AbstractProcessMonitor {
+  private static final Logger LOG = LoggerFactory.getLogger(EsProcessMonitor.class);
+  private static final int WAIT_FOR_UP_DELAY_IN_MILLIS = 100;
+  private static final int WAIT_FOR_UP_TIMEOUT = 10 * 60; /* 1min */
+
+  private final AtomicBoolean nodeUp = new AtomicBoolean(false);
+  private final AtomicBoolean nodeOperational = new AtomicBoolean(false);
+  private final URL healthCheckURL;
+
+  public EsProcessMonitor(Process process, String url) throws MalformedURLException {
+    super(process);
+    this.healthCheckURL = new URL(url + "/_cluster/health?wait_for_status=yellow&timeout=30s");
+  }
+
+  @Override
+  public boolean isOperational() {
+    if (nodeOperational.get()) {
+      return true;
+    }
+
+    try {
+      boolean flag = checkOperational();
+      if (flag) {
+        nodeOperational.set(true);
+      }
+    } catch (InterruptedException e) {
+      LOG.trace("Interrupted while checking ES node is operational", e);
+      Thread.currentThread().interrupt();
+    }
+    return nodeOperational.get();
+  }
+
+  private boolean checkOperational() throws InterruptedException {
+    int i = 0;
+    Status status = checkStatus();
+    do {
+      if (status != Status.CONNECTION_REFUSED) {
+        nodeUp.set(true);
+      } else {
+        Thread.sleep(WAIT_FOR_UP_DELAY_IN_MILLIS);
+        i++;
+        status = checkStatus();
+      }
+    } while (!nodeUp.get() && i < WAIT_FOR_UP_TIMEOUT);
+    return status == Status.YELLOW || status == Status.GREEN;
+  }
+
+  private Status checkStatus() {
+    try {
+      URLConnection urlConnection = healthCheckURL.openConnection();
+      urlConnection.connect();
+      String response = IOUtils.toString(urlConnection.getInputStream());
+      if (response.contains("\"status\":\"green\"")) {
+        return Status.GREEN;
+      } else if (response.contains("\"status\":\"yellow\"")) {
+        return Status.YELLOW;
+      } else if (response.contains("\"status\":\"red\"")) {
+        return Status.RED;
+      }
+      return Status.KO;
+    } catch (ConnectException e) {
+      return Status.CONNECTION_REFUSED;
+    } catch (IOException e) {
+      LOG.error("Unexpected error occurred while checking ES node status using WebService API", e);
+      return Status.KO;
+    }
+  }
+
+  enum Status {
+    CONNECTION_REFUSED, KO, RED, YELLOW, GREEN
+  }
+
+  @Override
+  public void askForStop() {
+    process.destroy();
+  }
+
+  @Override
+  public boolean askedForRestart() {
+    // ES does not support asking for restart
+    return false;
+  }
+
+  @Override
+  public void acknowledgeAskForRestart() {
+    // nothing to do
+  }
+}