You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2013/05/26 18:57:43 UTC
[18/28] git commit: More spring cleaning,
this time in the slave recovery tets.
More spring cleaning, this time in the slave recovery tets.
Review: https://reviews.apache.org/r/11279
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/a1e25cb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/a1e25cb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/a1e25cb7
Branch: refs/heads/master
Commit: a1e25cb703d1d6d206292d7aef926254f1377f34
Parents: bfa2255
Author: Benjamin Hindman <be...@twitter.com>
Authored: Sat May 11 19:38:15 2013 -0700
Committer: Benjamin Hindman <be...@twitter.com>
Committed: Sun May 26 00:13:41 2013 -0700
----------------------------------------------------------------------
src/tests/slave_recovery_tests.cpp | 166 +++++++++++++++----------------
1 files changed, 82 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/a1e25cb7/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 65f50ed..0315c52 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -155,12 +155,15 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
Try<PID<Slave> > slave = this->StartSlave(&isolator, flags);
ASSERT_SOME(slave);
- // Message expectations.
- Future<Message> registerFramework =
- FUTURE_MESSAGE(Eq(RegisterFrameworkMessage().GetTypeName()), _, _);
-
- // Scheduler expectations.
MockScheduler sched;
+
+ // Enable checkpointing for the framework.
+ FrameworkInfo frameworkInfo;
+ frameworkInfo.CopyFrom(DEFAULT_FRAMEWORK_INFO);
+ frameworkInfo.set_checkpoint(true);
+
+ MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+
FrameworkID frameworkId;
EXPECT_CALL(sched, registered(_, _, _))
.WillOnce(SaveArg<1>(&frameworkId));
@@ -170,18 +173,14 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState)
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
- // Enable checkpointing for the framework.
- FrameworkInfo frameworkInfo;
- frameworkInfo.CopyFrom(DEFAULT_FRAMEWORK_INFO);
- frameworkInfo.set_checkpoint(true);
-
- MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ Future<Message> registerFrameworkMessage =
+ FUTURE_MESSAGE(Eq(RegisterFrameworkMessage().GetTypeName()), _, _);
driver.start();
// Capture the framework pid.
- AWAIT_READY(registerFramework);
- UPID frameworkPid = registerFramework.get().from;
+ AWAIT_READY(registerFrameworkMessage);
+ UPID frameworkPid = registerFrameworkMessage.get().from;
AWAIT_READY(offers);
EXPECT_NE(0u, offers.get().size());
@@ -330,16 +329,8 @@ TYPED_TEST(SlaveRecoveryTest, RecoverStatusUpdateManager)
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
-
// Enable checkpointing for the framework.
FrameworkInfo frameworkInfo;
frameworkInfo.CopyFrom(DEFAULT_FRAMEWORK_INFO);
@@ -347,6 +338,13 @@ TYPED_TEST(SlaveRecoveryTest, RecoverStatusUpdateManager)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
driver.start();
AWAIT_READY(offers);
@@ -414,14 +412,7 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutor)
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
// Enable checkpointing for the framework.
FrameworkInfo frameworkInfo;
@@ -430,6 +421,13 @@ TYPED_TEST(SlaveRecoveryTest, ReconnectExecutor)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
driver.start();
AWAIT_READY(offers);
@@ -506,14 +504,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverUnregisteredExecutor)
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
// Enable checkpointing for the framework.
FrameworkInfo frameworkInfo;
@@ -522,6 +513,13 @@ TYPED_TEST(SlaveRecoveryTest, RecoverUnregisteredExecutor)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
driver.start();
AWAIT_READY(offers);
@@ -599,14 +597,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor)
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
// Enable checkpointing for the framework.
FrameworkInfo frameworkInfo;
@@ -615,6 +606,13 @@ TYPED_TEST(SlaveRecoveryTest, RecoverTerminatedExecutor)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
driver.start();
AWAIT_READY(offers);
@@ -698,14 +696,7 @@ TYPED_TEST(SlaveRecoveryTest, CleanupExecutor)
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
// Enable checkpointing for the framework.
FrameworkInfo frameworkInfo;
@@ -714,6 +705,13 @@ TYPED_TEST(SlaveRecoveryTest, CleanupExecutor)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
driver.start();
AWAIT_READY(offers);
@@ -780,14 +778,7 @@ TYPED_TEST(SlaveRecoveryTest, RemoveNonCheckpointingFramework)
Try<PID<Slave> > slave = this->StartSlave(&isolator);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
// Disable checkpointing for the framework.
FrameworkInfo frameworkInfo;
@@ -796,6 +787,13 @@ TYPED_TEST(SlaveRecoveryTest, RemoveNonCheckpointingFramework)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
driver.start();
AWAIT_READY(offers);
@@ -845,8 +843,15 @@ TYPED_TEST(SlaveRecoveryTest, NonCheckpointingFramework)
Try<PID<Slave> > slave = this->StartSlave(&isolator, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
+
+ // Disable checkpointing for the framework.
+ FrameworkInfo frameworkInfo;
+ frameworkInfo.CopyFrom(DEFAULT_FRAMEWORK_INFO);
+ frameworkInfo.set_checkpoint(false);
+
+ MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+
FrameworkID frameworkId;
EXPECT_CALL(sched, registered(_, _, _))
.WillOnce(SaveArg<1>(&frameworkId));
@@ -856,13 +861,6 @@ TYPED_TEST(SlaveRecoveryTest, NonCheckpointingFramework)
.WillOnce(FutureArg<1>(&offers))
.WillRepeatedly(Return()); // Ignore subsequent offers.
- // Disable checkpointing for the framework.
- FrameworkInfo frameworkInfo;
- frameworkInfo.CopyFrom(DEFAULT_FRAMEWORK_INFO);
- frameworkInfo.set_checkpoint(false);
-
- MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
-
driver.start();
AWAIT_READY(offers);
@@ -928,13 +926,7 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers1;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers1));
// Enable checkpointing for the framework.
FrameworkInfo frameworkInfo;
@@ -943,6 +935,12 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers1;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers1));
+
driver.start();
AWAIT_READY(offers1);
@@ -1039,14 +1037,7 @@ TYPED_TEST(SlaveRecoveryTest, GCExecutor)
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
// Enable checkpointing for the framework.
FrameworkInfo frameworkInfo;
@@ -1055,6 +1046,13 @@ TYPED_TEST(SlaveRecoveryTest, GCExecutor)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
driver.start();
AWAIT_READY(offers);
@@ -1161,14 +1159,7 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);
- // Scheduler expectations.
MockScheduler sched;
- EXPECT_CALL(sched, registered(_, _, _));
-
- Future<vector<Offer> > offers1;
- EXPECT_CALL(sched, resourceOffers(_, _))
- .WillOnce(FutureArg<1>(&offers1))
- .WillOnce(Return()); // Ignore the offer when slave is shutting down.
// Enable checkpointing for the framework.
FrameworkInfo frameworkInfo;
@@ -1177,6 +1168,13 @@ TYPED_TEST(SlaveRecoveryTest, ShutdownSlave)
MesosSchedulerDriver driver(&sched, frameworkInfo, master.get());
+ EXPECT_CALL(sched, registered(_, _, _));
+
+ Future<vector<Offer> > offers1;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers1))
+ .WillOnce(Return()); // Ignore the offer when slave is shutting down.
+
driver.start();
AWAIT_READY(offers1);