Repository: mesos Updated Branches: refs/heads/master ae513df1e -> 711797086
Added test case for TaskGroupValidationTest.ExecutorWithoutFrameworkId. Review: https://reviews.apache.org/r/51432/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/71179708 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/71179708 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/71179708 Branch: refs/heads/master Commit: 71179708650642e145f75e250bf6d6b3eaabb6c5 Parents: ae513df Author: Guangya Liu <gyliu...@gmail.com> Authored: Thu Aug 25 10:39:34 2016 -0700 Committer: Vinod Kone <vinodk...@gmail.com> Committed: Thu Aug 25 10:40:05 2016 -0700 ---------------------------------------------------------------------- src/tests/master_validation_tests.cpp | 79 ++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/71179708/src/tests/master_validation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp index 86b4b22..56e931c 100644 --- a/src/tests/master_validation_tests.cpp +++ b/src/tests/master_validation_tests.cpp @@ -1661,6 +1661,85 @@ TEST_F(TaskGroupValidationTest, TaskGroupAndExecutorUsesRevocableResources) "Task group and executor mix revocable and non-revocable resources")); } + +// Ensures that an executor without a framework id is +// rejected during `TaskGroupInfo` validation. +TEST_F(TaskGroupValidationTest, ExecutorWithoutFrameworkId) +{ + Try<Owned<cluster::Master>> master = StartMaster(); + ASSERT_SOME(master); + + Owned<MasterDetector> detector = master.get()->createDetector(); + Try<Owned<cluster::Slave>> slave = StartSlave(detector.get()); + ASSERT_SOME(slave); + + MockScheduler sched; + MesosSchedulerDriver driver( + &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL); + + EXPECT_CALL(sched, registered(&driver, _, _)) + .Times(1); + + Future<vector<Offer>> offers; + EXPECT_CALL(sched, resourceOffers(&driver, _)) + .WillOnce(FutureArg<1>(&offers)) + .WillRepeatedly(Return()); // Ignore subsequent offers. + + driver.start(); + + AWAIT_READY(offers); + EXPECT_NE(0u, offers.get().size()); + + // Create an invalid executor without framework id. + ExecutorInfo executor; + executor.set_type(ExecutorInfo::DEFAULT); + executor.mutable_executor_id()->set_value("E"); + + TaskInfo task1; + task1.set_name("1"); + task1.mutable_task_id()->set_value("1"); + task1.mutable_slave_id()->MergeFrom(offers.get()[0].slave_id()); + task1.mutable_resources()->MergeFrom(offers.get()[0].resources()); + + TaskInfo task2; + task2.set_name("2"); + task2.mutable_task_id()->set_value("2"); + task2.mutable_slave_id()->MergeFrom(offers.get()[0].slave_id()); + task2.mutable_resources()->MergeFrom(offers.get()[0].resources()); + + TaskGroupInfo taskGroup; + taskGroup.add_tasks()->CopyFrom(task1); + taskGroup.add_tasks()->CopyFrom(task2); + + Future<TaskStatus> task1Status; + Future<TaskStatus> task2Status; + EXPECT_CALL(sched, statusUpdate(&driver, _)) + .WillOnce(FutureArg<1>(&task1Status)) + .WillOnce(FutureArg<1>(&task2Status)); + + Offer::Operation operation; + operation.set_type(Offer::Operation::LAUNCH_GROUP); + + Offer::Operation::LaunchGroup* launchGroup = + operation.mutable_launch_group(); + + launchGroup->mutable_executor()->CopyFrom(executor); + launchGroup->mutable_task_group()->CopyFrom(taskGroup); + + driver.acceptOffers({offers.get()[0].id()}, {operation}); + + AWAIT_READY(task1Status); + EXPECT_EQ(TASK_ERROR, task1Status->state()); + EXPECT_EQ(TaskStatus::REASON_TASK_GROUP_INVALID, task1Status->reason()); + + AWAIT_READY(task2Status); + EXPECT_EQ(TASK_ERROR, task2Status->state()); + EXPECT_EQ(TaskStatus::REASON_TASK_GROUP_INVALID, task2Status->reason()); + + driver.stop(); + driver.join(); +} + } // namespace tests { } // namespace internal { } // namespace mesos {
