You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/09/04 03:34:14 UTC
git commit: Fixed a bug in SlaveRecoveryTest/*.MultipleFrameworks
test.
Updated Branches:
refs/heads/master 3aee3c4c3 -> 1c04cd4ee
Fixed a bug in SlaveRecoveryTest/*.MultipleFrameworks test.
From: Jiang Yan Xu <ya...@jxu.me>
Review: https://reviews.apache.org/r/13837
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1c04cd4e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1c04cd4e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1c04cd4e
Branch: refs/heads/master
Commit: 1c04cd4eebba5c9b285678064c853eb9056ee5fe
Parents: 3aee3c4
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Tue Sep 3 18:07:24 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Sep 3 18:07:24 2013 -0700
----------------------------------------------------------------------
src/tests/slave_recovery_tests.cpp | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1c04cd4e/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 57636c1..48b2e63 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -2230,7 +2230,8 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
Future<vector<Offer> > offers1;
EXPECT_CALL(sched1, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers1));
+ .WillOnce(FutureArg<1>(&offers1))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
driver1.start();
@@ -2272,7 +2273,8 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
Future<vector<Offer> > offers2;
EXPECT_CALL(sched2, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers2));
+ .WillOnce(FutureArg<1>(&offers2))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
driver2.start();
@@ -2332,6 +2334,13 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
.WillOnce(FutureArg<1>(&status2))
.WillRepeatedly(Return()); // Ignore subsequent updates.
+ // Wait for the executors to terminate before shutting down the
+ // slave in order to give cgroups (if applicable) time to clean up.
+ Future<Nothing> executorTerminated1 =
+ FUTURE_DISPATCH(_, &Slave::executorTerminated);
+ Future<Nothing> executorTerminated2 =
+ FUTURE_DISPATCH(_, &Slave::executorTerminated);
+
// Kill task 1.
driver1.killTask(task1.task_id());
@@ -2346,6 +2355,9 @@ TYPED_TEST(SlaveRecoveryTest, MultipleFrameworks)
AWAIT_READY(status2);
ASSERT_EQ(TASK_KILLED, status2.get().state());
+ AWAIT_READY(executorTerminated1);
+ AWAIT_READY(executorTerminated2);
+
driver1.stop();
driver1.join();
driver2.stop();