Merge pull request #384 from mesos/bug/369-SanityCheckState

Bug: KILLED wasn't considered an error state.
mesos · Oct 26, 2015 · b1300c8 · b1300c8
2 parents 2fa55c9 + d6c8838
commit b1300c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/state/ESTaskStatus.java b/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/state/ESTaskStatus.java
@@ -95,7 +95,8 @@ public boolean taskInError() {
 
     public static boolean errorState(TaskState state) {
         return state.equals(TaskState.TASK_ERROR) || state.equals(TaskState.TASK_FAILED)
-                || state.equals(TaskState.TASK_LOST) || state.equals(TaskState.TASK_FINISHED);
+                || state.equals(TaskState.TASK_LOST) || state.equals(TaskState.TASK_FINISHED)
+                || state.equals(TaskState.TASK_KILLED);
     }
 
     public void destroy() {

diff --git a/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/state/ESTaskStatusTest.java b/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/state/ESTaskStatusTest.java
@@ -91,4 +91,10 @@ public void shouldErrorWhenTaskFinishedToUpdateState() throws IOException {
         when(state.get(anyString())).thenReturn(ProtoTestUtil.getDefaultTaskStatus(Protos.TaskState.TASK_FINISHED));
         Assert.assertTrue(status.taskInError());
     }
+
+    @Test
+    public void shouldErrorWhenTaskKilled() throws IOException {
+        when(state.get(anyString())).thenReturn(ProtoTestUtil.getDefaultTaskStatus(Protos.TaskState.TASK_KILLED));
+        Assert.assertTrue(status.taskInError());
+    }
 }