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 2012/03/27 18:56:33 UTC
svn commit: r1305901 [2/2] - in /incubator/mesos/trunk: hadoop/
include/mesos/ src/common/ src/examples/ src/examples/java/
src/examples/python/ src/exec/ src/java/jni/ src/java/src/org/apache/mesos/
src/launcher/ src/master/ src/messages/ src/python/n...
Modified: incubator/mesos/trunk/src/tests/fault_tolerance_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/fault_tolerance_tests.cpp?rev=1305901&r1=1305900&r2=1305901&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/fault_tolerance_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/fault_tolerance_tests.cpp Tue Mar 27 16:56:31 2012
@@ -90,7 +90,7 @@ TEST(FaultToleranceTest, SlaveLost)
trigger resourceOffersCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -157,7 +157,7 @@ TEST(FaultToleranceTest, SlavePartitione
trigger resourceOffersCall, slaveLostCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -211,7 +211,7 @@ TEST(FaultToleranceTest, SchedulerFailov
trigger sched1RegisteredCall;
- EXPECT_CALL(sched1, registered(&driver1, _))
+ EXPECT_CALL(sched1, registered(&driver1, _, _))
.WillOnce(DoAll(SaveArg<1>(&frameworkId), Trigger(&sched1RegisteredCall)));
EXPECT_CALL(sched1, resourceOffers(&driver1, _))
@@ -236,7 +236,7 @@ TEST(FaultToleranceTest, SchedulerFailov
trigger sched2RegisteredCall;
- EXPECT_CALL(sched2, registered(&driver2, frameworkId))
+ EXPECT_CALL(sched2, registered(&driver2, frameworkId, _))
.WillOnce(Trigger(&sched2RegisteredCall));
EXPECT_CALL(sched2, resourceOffers(&driver2, _))
@@ -278,7 +278,7 @@ TEST(FaultToleranceTest, FrameworkReliab
trigger schedRegisteredCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(Trigger(&schedRegisteredCall));
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -329,11 +329,14 @@ TEST(FaultToleranceTest, FrameworkReregi
MockScheduler sched;
MesosSchedulerDriver driver(&sched, "", master);
- trigger schedRegisteredCall;
+ trigger schedRegisteredCall, schedReregisteredCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(Trigger(&schedRegisteredCall));
+ EXPECT_CALL(sched, reregistered(&driver, _))
+ .WillOnce(Trigger(&schedReregisteredCall));
+
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillRepeatedly(Return());
@@ -341,16 +344,11 @@ TEST(FaultToleranceTest, FrameworkReregi
.Times(AtMost(1));
process::Message message;
- trigger schedReregisteredMsg;
EXPECT_MESSAGE(filter, Eq(FrameworkRegisteredMessage().GetTypeName()), _, _)
.WillOnce(DoAll(SaveArgField<0>(&process::MessageEvent::message, &message),
Return(false)));
- EXPECT_MESSAGE(filter, Eq(FrameworkReregisteredMessage().GetTypeName()), _, _)
- .WillOnce(DoAll(Trigger(&schedReregisteredMsg),
- Return(false)));
-
driver.start();
WAIT_UNTIL(schedRegisteredCall); // Ensures registered message is received.
@@ -362,7 +360,7 @@ TEST(FaultToleranceTest, FrameworkReregi
process::post(message.to, newMasterDetectedMsg);
- WAIT_UNTIL(schedReregisteredMsg);
+ WAIT_UNTIL(schedReregisteredCall);
driver.stop();
driver.join();
@@ -372,6 +370,7 @@ TEST(FaultToleranceTest, FrameworkReregi
process::filter(NULL);
}
+
// TOOD(vinod): Disabling this test for now because
// of the following race condition breaking this test:
// We do a driver.launchTasks() after post(noMasterDetected)
@@ -393,7 +392,7 @@ TEST(FaultToleranceTest, DISABLED_TaskLo
PID<Master> master = process::spawn(&m);
MockExecutor exec;
- EXPECT_CALL(exec, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec, registered(_, _, _, _))
.Times(0);
EXPECT_CALL(exec, launchTask(_, _))
@@ -420,7 +419,7 @@ TEST(FaultToleranceTest, DISABLED_TaskLo
trigger statusUpdateCall, resourceOffersCall;
TaskStatus status;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -500,7 +499,7 @@ TEST(FaultToleranceTest, SchedulerFailov
trigger shutdownCall;
- EXPECT_CALL(exec, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec, registered(_, _, _, _))
.Times(1);
EXPECT_CALL(exec, launchTask(_, _))
@@ -532,7 +531,7 @@ TEST(FaultToleranceTest, SchedulerFailov
trigger resourceOffersCall, statusUpdateMsg;
- EXPECT_CALL(sched1, registered(&driver1, _))
+ EXPECT_CALL(sched1, registered(&driver1, _, _))
.WillOnce(SaveArg<1>(&frameworkId));
EXPECT_CALL(sched1, resourceOffers(&driver1, _))
@@ -581,7 +580,7 @@ TEST(FaultToleranceTest, SchedulerFailov
trigger registeredCall, statusUpdateCall;
- EXPECT_CALL(sched2, registered(&driver2, frameworkId))
+ EXPECT_CALL(sched2, registered(&driver2, frameworkId, _))
.WillOnce(Trigger(®isteredCall));
EXPECT_CALL(sched2, statusUpdate(&driver2, _))
@@ -627,7 +626,7 @@ TEST(FaultToleranceTest, SchedulerFailov
ExecutorDriver* execDriver;
- EXPECT_CALL(exec, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec, registered(_, _, _, _))
.WillOnce(SaveArg<0>(&execDriver));
EXPECT_CALL(exec, launchTask(_, _))
@@ -658,7 +657,7 @@ TEST(FaultToleranceTest, SchedulerFailov
TaskStatus status;
trigger sched1ResourceOfferCall, sched1StatusUpdateCall;
- EXPECT_CALL(sched1, registered(&driver1, _))
+ EXPECT_CALL(sched1, registered(&driver1, _, _))
.WillOnce(SaveArg<1>(&frameworkId));
EXPECT_CALL(sched1, statusUpdate(&driver1, _))
.WillOnce(DoAll(SaveArg<1>(&status), Trigger(&sched1StatusUpdateCall)));
@@ -698,7 +697,7 @@ TEST(FaultToleranceTest, SchedulerFailov
trigger sched2RegisteredCall, sched2FrameworkMessageCall;
- EXPECT_CALL(sched2, registered(&driver2, frameworkId))
+ EXPECT_CALL(sched2, registered(&driver2, frameworkId, _))
.WillOnce(Trigger(&sched2RegisteredCall));
EXPECT_CALL(sched2, frameworkMessage(&driver2, _, _, _))
@@ -763,7 +762,7 @@ TEST(FaultToleranceTest, SlaveReliableRe
trigger resourceOffersCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -821,7 +820,7 @@ TEST(FaultToleranceTest, SlaveReregister
trigger resourceOffersCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
Modified: incubator/mesos/trunk/src/tests/master_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/master_tests.cpp?rev=1305901&r1=1305900&r2=1305901&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/master_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/master_tests.cpp Tue Mar 27 16:56:31 2012
@@ -76,7 +76,7 @@ TEST(MasterTest, TaskRunning)
trigger shutdownCall;
- EXPECT_CALL(exec, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec, registered(_, _, _, _))
.Times(1);
EXPECT_CALL(exec, launchTask(_, _))
@@ -105,7 +105,7 @@ TEST(MasterTest, TaskRunning)
trigger resourceOffersCall, statusUpdateCall, resourcesChangedCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -169,7 +169,7 @@ TEST(MasterTest, KillTask)
trigger killTaskCall, shutdownCall;
- EXPECT_CALL(exec, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec, registered(_, _, _, _))
.Times(1);
EXPECT_CALL(exec, launchTask(_, _))
@@ -201,7 +201,7 @@ TEST(MasterTest, KillTask)
trigger resourceOffersCall, statusUpdateCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -269,7 +269,7 @@ TEST(MasterTest, FrameworkMessage)
trigger execFrameworkMessageCall, shutdownCall;
- EXPECT_CALL(exec, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec, registered(_, _, _, _))
.WillOnce(SaveArg<0>(&execDriver));
EXPECT_CALL(exec, launchTask(_, _))
@@ -306,7 +306,7 @@ TEST(MasterTest, FrameworkMessage)
trigger resourceOffersCall, statusUpdateCall, schedFrameworkMessageCall;
- EXPECT_CALL(sched, registered(&schedDriver, _))
+ EXPECT_CALL(sched, registered(&schedDriver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&schedDriver, _))
@@ -345,9 +345,9 @@ TEST(MasterTest, FrameworkMessage)
string hello = "hello";
- schedDriver.sendFrameworkMessage(offers[0].slave_id(),
- DEFAULT_EXECUTOR_ID,
- hello);
+ schedDriver.sendFrameworkMessage(DEFAULT_EXECUTOR_ID,
+ offers[0].slave_id(),
+ hello);
WAIT_UNTIL(execFrameworkMessageCall);
@@ -386,7 +386,7 @@ TEST(MasterTest, MultipleExecutors)
TaskInfo exec1Task;
trigger exec1LaunchTaskCall, exec1ShutdownCall;
- EXPECT_CALL(exec1, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec1, registered(_, _, _, _))
.Times(1);
EXPECT_CALL(exec1, launchTask(_, _))
@@ -401,7 +401,7 @@ TEST(MasterTest, MultipleExecutors)
TaskInfo exec2Task;
trigger exec2LaunchTaskCall, exec2ShutdownCall;
- EXPECT_CALL(exec2, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec2, registered(_, _, _, _))
.Times(1);
EXPECT_CALL(exec2, launchTask(_, _))
@@ -439,7 +439,7 @@ TEST(MasterTest, MultipleExecutors)
trigger resourceOffersCall, statusUpdateCall1, statusUpdateCall2;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -511,6 +511,144 @@ TEST(MasterTest, MultipleExecutors)
}
+TEST(MasterTest, MasterInfo)
+{
+ ASSERT_TRUE(GTEST_IS_THREADSAFE);
+
+ MockFilter filter;
+ process::filter(&filter);
+
+ EXPECT_MESSAGE(filter, _, _, _)
+ .WillRepeatedly(Return(false));
+
+ SimpleAllocator a;
+ Master m(&a);
+ PID<Master> master = process::spawn(&m);
+
+ MockExecutor exec;
+
+ map<ExecutorID, Executor*> execs;
+ execs[DEFAULT_EXECUTOR_ID] = &exec;
+
+ TestingIsolationModule isolationModule(execs);
+
+ Resources resources = Resources::parse("cpus:2;mem:1024");
+
+ Slave s(resources, true, &isolationModule);
+ PID<Slave> slave = process::spawn(&s);
+
+ BasicMasterDetector detector(master, slave, true);
+
+ MockScheduler sched;
+ MesosSchedulerDriver driver(&sched, "", master);
+ MasterInfo masterInfo;
+
+ trigger registeredCall;
+
+ EXPECT_CALL(sched, registered(&driver, _, _))
+ .WillOnce(DoAll(SaveArg<2>(&masterInfo),
+ Trigger(®isteredCall)));
+
+ EXPECT_CALL(sched, resourceOffers(&driver, _))
+ .WillRepeatedly(Return());
+
+ driver.start();
+
+ WAIT_UNTIL(registeredCall);
+
+ EXPECT_EQ(master.port, masterInfo.port());
+ EXPECT_EQ(master.ip, masterInfo.ip());
+
+ driver.stop();
+ driver.join();
+
+ process::terminate(slave);
+ process::wait(slave);
+
+ process::terminate(master);
+ process::wait(master);
+
+ process::filter(NULL);
+}
+
+
+TEST(MasterTest, MasterInfoOnReElection)
+{
+ ASSERT_TRUE(GTEST_IS_THREADSAFE);
+
+ MockFilter filter;
+ process::filter(&filter);
+
+ EXPECT_MESSAGE(filter, _, _, _)
+ .WillRepeatedly(Return(false));
+
+ SimpleAllocator a;
+ Master m(&a);
+ PID<Master> master = process::spawn(&m);
+
+ MockExecutor exec;
+
+ map<ExecutorID, Executor*> execs;
+ execs[DEFAULT_EXECUTOR_ID] = &exec;
+
+ TestingIsolationModule isolationModule(execs);
+
+ Resources resources = Resources::parse("cpus:2;mem:1024");
+
+ Slave s(resources, true, &isolationModule);
+ PID<Slave> slave = process::spawn(&s);
+
+ BasicMasterDetector detector(master, slave, true);
+
+ MockScheduler sched;
+ MesosSchedulerDriver driver(&sched, "", master);
+ MasterInfo masterInfo;
+
+ trigger registeredCall, reregisteredCall;
+
+ EXPECT_CALL(sched, registered(&driver, _, _))
+ .WillOnce(Trigger(®isteredCall));
+
+ EXPECT_CALL(sched, reregistered(&driver, _))
+ .WillOnce(DoAll(SaveArg<1>(&masterInfo),Trigger(&reregisteredCall)));
+
+ EXPECT_CALL(sched, resourceOffers(&driver, _))
+ .WillRepeatedly(Return());
+
+ process::Message message;
+
+ EXPECT_MESSAGE(filter, Eq(FrameworkRegisteredMessage().GetTypeName()), _, _)
+ .WillOnce(DoAll(SaveArgField<0>(&process::MessageEvent::message, &message),
+ Return(false)));
+
+ driver.start();
+
+ WAIT_UNTIL(registeredCall);
+
+ // Simulate a spurious newMasterDetected event (e.g., due to ZooKeeper
+ // expiration) at the scheduler.
+ NewMasterDetectedMessage newMasterDetectedMsg;
+ newMasterDetectedMsg.set_pid(master);
+
+ process::post(message.to, newMasterDetectedMsg);
+
+ WAIT_UNTIL(reregisteredCall);
+
+ EXPECT_EQ(master.port, masterInfo.port());
+ EXPECT_EQ(master.ip, masterInfo.ip());
+
+ driver.stop();
+ driver.join();
+
+ process::terminate(slave);
+ process::wait(slave);
+
+ process::terminate(master);
+ process::wait(master);
+
+ process::filter(NULL);
+}
+
// FrameworksManager test cases.
class MockFrameworksStorage : public FrameworksStorage
@@ -526,6 +664,77 @@ public:
};
+TEST(MasterTest, MasterLost)
+{
+ ASSERT_TRUE(GTEST_IS_THREADSAFE);
+
+ MockFilter filter;
+ process::filter(&filter);
+
+ EXPECT_MESSAGE(filter, _, _, _)
+ .WillRepeatedly(Return(false));
+
+ SimpleAllocator a;
+ Master m(&a);
+ PID<Master> master = process::spawn(&m);
+
+ MockExecutor exec;
+
+ map<ExecutorID, Executor*> execs;
+ execs[DEFAULT_EXECUTOR_ID] = &exec;
+
+ TestingIsolationModule isolationModule(execs);
+
+ Resources resources = Resources::parse("cpus:2;mem:1024");
+
+ Slave s(resources, true, &isolationModule);
+ PID<Slave> slave = process::spawn(&s);
+
+ BasicMasterDetector detector(master, slave, true);
+
+ MockScheduler sched;
+ MesosSchedulerDriver driver(&sched, "", master);
+ MasterInfo masterInfo;
+
+ trigger registeredCall, masterLostCall;
+
+ EXPECT_CALL(sched, registered(&driver, _, _))
+ .WillOnce(Trigger(®isteredCall));
+
+ EXPECT_CALL(sched, masterLost(&driver))
+ .WillOnce(Trigger(&masterLostCall));
+
+ EXPECT_CALL(sched, resourceOffers(&driver, _))
+ .WillRepeatedly(Return());
+
+ process::Message message;
+
+ EXPECT_MESSAGE(filter, Eq(FrameworkRegisteredMessage().GetTypeName()), _, _)
+ .WillOnce(DoAll(SaveArgField<0>(&process::MessageEvent::message, &message),
+ Return(false)));
+
+ driver.start();
+
+ WAIT_UNTIL(registeredCall);
+
+ // Simulate a spurious noMasterDetected event at the scheduler.
+ NoMasterDetectedMessage noMasterDetectedMsg;
+ process::post(message.to, noMasterDetectedMsg);
+
+ WAIT_UNTIL(masterLostCall);
+
+ driver.stop();
+ driver.join();
+
+ process::terminate(slave);
+ process::wait(slave);
+
+ process::terminate(master);
+ process::wait(master);
+
+ process::filter(NULL);
+}
+
// This fixture sets up expectations on the storage class
// and spawns both storage and frameworks manager.
class FrameworksManagerTestFixture : public ::testing::Test
Modified: incubator/mesos/trunk/src/tests/resource_offers_tests.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/resource_offers_tests.cpp?rev=1305901&r1=1305900&r2=1305901&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/resource_offers_tests.cpp (original)
+++ incubator/mesos/trunk/src/tests/resource_offers_tests.cpp Tue Mar 27 16:56:31 2012
@@ -72,7 +72,7 @@ TEST(ResourceOffersTest, ResourceOfferWi
trigger resourceOffersCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -114,7 +114,7 @@ TEST(ResourceOffersTest, TaskUsesNoResou
trigger resourceOffersCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -174,7 +174,7 @@ TEST(ResourceOffersTest, TaskUsesInvalid
trigger resourceOffersCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -239,7 +239,7 @@ TEST(ResourceOffersTest, TaskUsesMoreRes
trigger resourceOffersCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
@@ -304,7 +304,7 @@ TEST(ResourceOffersTest, ResourcesGetReo
trigger sched1ResourceOfferCall;
- EXPECT_CALL(sched1, registered(&driver1, _))
+ EXPECT_CALL(sched1, registered(&driver1, _, _))
.Times(1);
EXPECT_CALL(sched1, resourceOffers(&driver1, _))
@@ -330,7 +330,7 @@ TEST(ResourceOffersTest, ResourcesGetReo
trigger sched2ResourceOfferCall;
- EXPECT_CALL(sched2, registered(&driver2, _))
+ EXPECT_CALL(sched2, registered(&driver2, _, _))
.Times(1);
EXPECT_CALL(sched2, resourceOffers(&driver2, _))
@@ -364,7 +364,7 @@ TEST(ResourceOffersTest, ResourcesGetReo
trigger sched1ResourceOffersCall;
- EXPECT_CALL(sched1, registered(&driver1, _))
+ EXPECT_CALL(sched1, registered(&driver1, _, _))
.Times(1);
EXPECT_CALL(sched1, resourceOffers(&driver1, _))
@@ -422,7 +422,7 @@ TEST(ResourceOffersTest, ResourcesGetReo
trigger sched2ResourceOffersCall;
- EXPECT_CALL(sched2, registered(&driver2, _))
+ EXPECT_CALL(sched2, registered(&driver2, _, _))
.Times(1);
EXPECT_CALL(sched2, resourceOffers(&driver2, _))
@@ -481,7 +481,7 @@ TEST(ResourceOffersTest, Request)
trigger registeredCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.WillOnce(Trigger(®isteredCall));
driver.start();
@@ -527,7 +527,7 @@ TEST(ResourceOffersTest, TasksExecutorIn
trigger shutdownCall;
- EXPECT_CALL(exec, registered(_, _, _, _, _, _))
+ EXPECT_CALL(exec, registered(_, _, _, _))
.Times(AtMost(1));
EXPECT_CALL(exec, launchTask(_, _))
@@ -555,7 +555,7 @@ TEST(ResourceOffersTest, TasksExecutorIn
trigger resourceOffersCall;
- EXPECT_CALL(sched, registered(&driver, _))
+ EXPECT_CALL(sched, registered(&driver, _, _))
.Times(1);
EXPECT_CALL(sched, resourceOffers(&driver, _))
Modified: incubator/mesos/trunk/src/tests/utils.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/utils.hpp?rev=1305901&r1=1305900&r2=1305901&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/utils.hpp (original)
+++ incubator/mesos/trunk/src/tests/utils.hpp Tue Mar 27 16:56:31 2012
@@ -107,17 +107,25 @@ void enterTestDirectory(const char* test
class MockScheduler : public Scheduler
{
public:
- MOCK_METHOD2(registered, void(SchedulerDriver*, const FrameworkID&));
+ MOCK_METHOD3(registered, void(SchedulerDriver*,
+ const FrameworkID&,
+ const MasterInfo&));
+ MOCK_METHOD2(reregistered, void(SchedulerDriver*, const MasterInfo&));
MOCK_METHOD2(resourceOffers, void(SchedulerDriver*,
const std::vector<Offer>&));
MOCK_METHOD2(offerRescinded, void(SchedulerDriver*, const OfferID&));
MOCK_METHOD2(statusUpdate, void(SchedulerDriver*, const TaskStatus&));
MOCK_METHOD4(frameworkMessage, void(SchedulerDriver*,
- const SlaveID&,
const ExecutorID&,
+ const SlaveID&,
const std::string&));
MOCK_METHOD2(slaveLost, void(SchedulerDriver*, const SlaveID&));
MOCK_METHOD3(error, void(SchedulerDriver*, int, const std::string&));
+ MOCK_METHOD1(masterLost, void(SchedulerDriver*));
+ MOCK_METHOD4(executorLost, void(SchedulerDriver*,
+ const ExecutorID&,
+ const SlaveID&,
+ int));
};
@@ -127,15 +135,16 @@ public:
class MockExecutor : public Executor
{
public:
- MOCK_METHOD6(registered, void(ExecutorDriver*,
+ MOCK_METHOD4(registered, void(ExecutorDriver*,
const ExecutorInfo&,
- const FrameworkID&,
const FrameworkInfo&,
- const SlaveID&,
const SlaveInfo&));
+ MOCK_METHOD2(reregistered, void(ExecutorDriver*,
+ const SlaveInfo&));
MOCK_METHOD2(launchTask, void(ExecutorDriver*, const TaskInfo&));
MOCK_METHOD2(killTask, void(ExecutorDriver*, const TaskID&));
MOCK_METHOD2(frameworkMessage, void(ExecutorDriver*, const std::string&));
+ MOCK_METHOD1(slaveLost, void(ExecutorDriver*));
MOCK_METHOD1(shutdown, void(ExecutorDriver*));
MOCK_METHOD3(error, void(ExecutorDriver*, int, const std::string&));
};