SONAR-5408 - Added workingDirectory to ProcessWrapper

1 files changed, 9 insertions, 3 deletions

diff --git a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
index e07850b285d..7f72ad39969 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
@@ -21,6 +21,7 @@ package org.sonar.search;
 
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.common.settings.ImmutableSettings;
+import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.NodeBuilder;
 import org.slf4j.Logger;
@@ -104,9 +105,14 @@ public class ElasticSearch extends Process {
   @Override
   public boolean isReady() {
     try {
-      ClusterHealthStatus status = node.client().admin().cluster().prepareClusterStats()
-        .get().getStatus();
-      return status != null && status == ClusterHealthStatus.GREEN;
+      return (node.client().admin().cluster().prepareHealth()
+        .setWaitForYellowStatus()
+        .setTimeout(TimeValue.timeValueSeconds(3L))
+        .get()
+        .getStatus() != ClusterHealthStatus.RED);
+//      ClusterHealthStatus status = node.client().admin().cluster().prepareClusterStats()
+//        .get().getStatus();
+//      return status != null && status == ClusterHealthStatus.GREEN;
     } catch (Exception e) {
       return false;
     }