Fixed two slave recovery tests. These two tests are affected by the lingering executor fix (#65109). We should wait to make sure tasks are actually launched on the executor before trigger the agent failover. Otherwise, the container will be shutdown upon re-registration because the executor has never received any task.
Review: https://reviews.apache.org/r/65572/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8ce53571 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8ce53571 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8ce53571 Branch: refs/heads/1.4.x Commit: 8ce535714bd355c202c22d820ef261509f692dd7 Parents: 9c14850 Author: Meng Zhu <m...@mesosphere.io> Authored: Thu Feb 8 17:19:48 2018 -0800 Committer: Benjamin Mahler <bmah...@apache.org> Committed: Mon Feb 12 21:48:52 2018 -0800 ---------------------------------------------------------------------- src/tests/slave_recovery_tests.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8ce53571/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 6207a50..ca16401 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -4528,7 +4528,11 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward) // Scheduler expectations. EXPECT_CALL(sched, registered(_, _, _)); + Future<TaskStatus> statusStarting; + Future<TaskStatus> statusRunning; EXPECT_CALL(sched, statusUpdate(_, _)) + .WillOnce(FutureArg<1>(&statusStarting)) + .WillOnce(FutureArg<1>(&statusRunning)) .WillRepeatedly(Return()); Future<vector<Offer>> offers1; @@ -4560,6 +4564,13 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward) ContainerID containerId = *(containers->begin()); + // Wait until task is running. + AWAIT_READY(statusStarting); + EXPECT_EQ(TASK_STARTING, statusStarting->state()); + + AWAIT_READY(statusRunning); + EXPECT_EQ(TASK_RUNNING, statusRunning->state()); + // Stop the slave. slave.get()->terminate(); @@ -4632,7 +4643,11 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward) // Scheduler expectations. EXPECT_CALL(sched, registered(_, _, _)); + Future<TaskStatus> statusStarting; + Future<TaskStatus> statusRunning; EXPECT_CALL(sched, statusUpdate(_, _)) + .WillOnce(FutureArg<1>(&statusStarting)) + .WillOnce(FutureArg<1>(&statusRunning)) .WillRepeatedly(Return()); Future<vector<Offer>> offers1; @@ -4664,6 +4679,13 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward) ContainerID containerId = *(containers->begin()); + // Wait until task is running. + AWAIT_READY(statusStarting); + EXPECT_EQ(TASK_STARTING, statusStarting->state()); + + AWAIT_READY(statusRunning); + EXPECT_EQ(TASK_RUNNING, statusRunning->state()); + // Stop the slave. slave.get()->terminate();
