Merge pull request #503 from mesos/bug/481-ClusterTimeoutWhenScaling

Add cluster yellow to list of valid run states.
mesos · Feb 18, 2016 · 63f159b · 63f159b
2 parents b03c4ff + d732f98
commit 63f159b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...or/src/main/java/org/apache/mesos/elasticsearch/executor/mesos/ElasticsearchExecutor.java b/...or/src/main/java/org/apache/mesos/elasticsearch/executor/mesos/ElasticsearchExecutor.java
@@ -28,6 +28,7 @@
 public class ElasticsearchExecutor implements Executor {
     public static final long ES_TIMEOUT = 120L;
     public static final String ES_STATUS_GREEN = "green";
+    public static final String ES_STATUS_YELLOW = "yellow";
     private final Launcher launcher;
     public static final Logger LOGGER = Logger.getLogger(ElasticsearchExecutor.class.getCanonicalName());
     private final TaskStatus taskStatus;
@@ -107,8 +108,7 @@ public void launchTask(final ExecutorDriver driver, final Protos.TaskInfo task)
                 Awaitility.await()
                         .atMost(ES_TIMEOUT, TimeUnit.SECONDS)
                         .pollInterval(1L, TimeUnit.SECONDS)
-                        .until(() -> nodeUtil.getNodeStatus(node).equals(ES_STATUS_GREEN));
-
+                        .until(() -> nodeUtil.getNodeStatus(node).equals(ES_STATUS_GREEN) || nodeUtil.getNodeStatus(node).equals(ES_STATUS_YELLOW));
                 // Send status update, running
                 driver.sendStatusUpdate(taskStatus.running());
             } catch (ConditionTimeoutException e) {