Repository: mesos Updated Branches: refs/heads/master aa16bbd90 -> 34d4a2f5a
Fixed two flaky slave recovery tests. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/34d4a2f5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/34d4a2f5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/34d4a2f5 Branch: refs/heads/master Commit: 34d4a2f5af90b32a0946c59a0d1380fc8cf9f621 Parents: aa16bbd Author: Benjamin Mahler <[email protected]> Authored: Wed Jul 30 12:00:17 2014 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Wed Jul 30 13:49:02 2014 -0700 ---------------------------------------------------------------------- src/tests/slave_recovery_tests.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/34d4a2f5/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 68ea3a2..06ab899 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -1309,6 +1309,9 @@ TYPED_TEST(SlaveRecoveryTest, KillTask) Future<Nothing> _recover = FUTURE_DISPATCH(_, &Slave::_recover); + Future<ReregisterExecutorMessage> reregisterExecutorMessage = + FUTURE_PROTOBUF(ReregisterExecutorMessage(), _, _); + Future<SlaveReregisteredMessage> slaveReregisteredMessage = FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, _); @@ -1323,6 +1326,9 @@ TYPED_TEST(SlaveRecoveryTest, KillTask) AWAIT_READY(_recover); + // Wait for the executor to re-register. + AWAIT_READY(reregisterExecutorMessage); + Clock::settle(); // Wait for slave to schedule reregister timeout. Clock::advance(EXECUTOR_REREGISTER_TIMEOUT); @@ -2440,10 +2446,10 @@ TYPED_TEST(SlaveRecoveryTest, SchedulerFailover) Future<Nothing> _recover = FUTURE_DISPATCH(_, &Slave::_recover); Future<ReregisterExecutorMessage> reregisterExecutorMessage = - FUTURE_PROTOBUF(ReregisterExecutorMessage(), _, _); + FUTURE_PROTOBUF(ReregisterExecutorMessage(), _, _); Future<SlaveReregisteredMessage> slaveReregisteredMessage = - FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, _); + FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, _); // Restart the slave (use same flags) with a new containerizer. Try<TypeParam*> containerizer2 = TypeParam::create(flags, true); @@ -2895,6 +2901,12 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks) Future<Nothing> _recover = FUTURE_DISPATCH(_, &Slave::_recover); + Future<ReregisterExecutorMessage> reregisterExecutorMessage2 = + FUTURE_PROTOBUF(ReregisterExecutorMessage(), _, _); + + Future<ReregisterExecutorMessage> reregisterExecutorMessage1 = + FUTURE_PROTOBUF(ReregisterExecutorMessage(), _, _); + Future<SlaveReregisteredMessage> slaveReregisteredMessage = FUTURE_PROTOBUF(SlaveReregisteredMessage(), _, _); @@ -2909,6 +2921,10 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks) AWAIT_READY(_recover); + // Wait for the executors to re-register. + AWAIT_READY(reregisterExecutorMessage1); + AWAIT_READY(reregisterExecutorMessage2); + Clock::settle(); // Wait for slave to schedule reregister timeout. Clock::advance(EXECUTOR_REREGISTER_TIMEOUT);
