test

Author: ssalinas

SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosSchedulerImpl.java

@@ -787,7 +787,7 @@ private CompletableFuture<StatusUpdateResult> handleStatusUpdateAsync(
             );
           }
           if (result == StatusUpdateResult.KILL_TASK) {
-            LOG.info(
+            LOG.warn(
               "Killing a task {} which Singularity has no remaining active state for. It will be given 1 minute to shut down gracefully",
               status.getTaskId().getValue()
             );

SingularityService/src/test/java/com/hubspot/singularity/scheduler/SingularitySchedulerTest.java

@@ -2622,14 +2622,23 @@ public void testTaskOddities() {
 
     Assertions.assertTrue(taskManager.isActiveTask(taskOne.getTaskId()));
 
-    statusUpdate(taskOne, TaskState.TASK_RUNNING);
-    List<SingularityTaskHistoryUpdate> updates = taskManager.getTaskHistoryUpdates(
-      taskOne.getTaskId()
-    );
-    Assertions.assertEquals(2, updates.size());
-    Assertions.assertTrue(
-      updates.stream().anyMatch(t -> t.getTaskState() == ExtendedTaskState.TASK_CLEANING)
+    // assert that we sent back a status that was not DONE for the status update (e.g. KILL_TASK)
+    Assertions.assertFalse(
+      sms
+        .statusUpdate(
+          TaskStatus
+            .newBuilder()
+            .setTaskId(MesosProtosUtils.toTaskId(taskOne.getMesosTask().getTaskId()))
+            .setAgentId(MesosProtosUtils.toAgentId(taskOne.getAgentId()))
+            .setState(TaskState.TASK_RUNNING)
+            .build()
+        )
+        .join()
     );
+
+    // Task should get killed because we cannot recover any state
+    statusUpdate(taskOne, TaskState.TASK_KILLED);
+    Assertions.assertFalse(taskManager.isActiveTask(taskOne.getTaskId()));
   }
 
   @Test