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 2017/05/26 23:57:20 UTC
[2/3] mesos git commit: Added a test for shutting down executors that
re-register.
Added a test for shutting down executors that re-register.
When already (re-)registered executors attempt to re-register,
and the agent does not have the optional reconnect retry enabled,
the agent will shut down the executor.
Review: https://reviews.apache.org/r/59586
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6a970072
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6a970072
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6a970072
Branch: refs/heads/master
Commit: 6a970072e91f7574511c50434baea39734f71dbc
Parents: 9478073
Author: Benjamin Mahler <bm...@apache.org>
Authored: Thu May 25 14:38:12 2017 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri May 26 16:56:53 2017 -0700
----------------------------------------------------------------------
src/tests/slave_tests.cpp | 100 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6a970072/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 68ed8e9..52611de 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -7004,6 +7004,106 @@ TEST_F(SlaveTest, MaxCompletedExecutorsPerFrameworkFlag)
}
}
+
+// This ensures that if the executor reconnect retry is disabled,
+// PID-based V0 executors are disallowed from re-registering in
+// the steady state.
+//
+// TODO(bmahler): It should be simpler to write a test that
+// follows a standard recipe (e.g. bring up a mock executor).
+TEST_F(SlaveTest, ShutdownV0ExecutorIfItReregistersWithoutReconnect)
+{
+ Clock::pause();
+
+ master::Flags masterFlags = CreateMasterFlags();
+ Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
+ ASSERT_SOME(master);
+
+ MockExecutor exec(DEFAULT_EXECUTOR_ID);
+ TestContainerizer containerizer(&exec);
+
+ slave::Flags agentFlags = CreateSlaveFlags();
+ Owned<MasterDetector> detector = master.get()->createDetector();
+ Try<Owned<cluster::Slave>> slave =
+ StartSlave(detector.get(), &containerizer, agentFlags);
+ ASSERT_SOME(slave);
+
+ FrameworkInfo frameworkInfo = DEFAULT_FRAMEWORK_INFO;
+ frameworkInfo.set_checkpoint(true); // Enable checkpointing.
+
+ MockScheduler sched;
+ MesosSchedulerDriver driver(
+ &sched, frameworkInfo, master.get()->pid, DEFAULT_CREDENTIAL);
+
+ FrameworkID frameworkId;
+ EXPECT_CALL(sched, registered(_, _, _))
+ .WillOnce(SaveArg<1>(&frameworkId));
+
+ Future<vector<Offer>> offers;
+ EXPECT_CALL(sched, resourceOffers(_, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
+ driver.start();
+
+ // Advance the clock to trigger both agent registration and a batch
+ // allocation.
+ Clock::advance(agentFlags.registration_backoff_factor);
+ Clock::advance(masterFlags.allocation_interval);
+
+ AWAIT_READY(offers);
+ EXPECT_NE(0u, offers->size());
+
+ EXPECT_CALL(exec, registered(_, _, _, _));
+
+ EXPECT_CALL(exec, launchTask(_, _))
+ .WillOnce(SendStatusUpdateFromTask(TASK_RUNNING));
+
+ // Capture the agent and executor PIDs.
+ Future<Message> registerExecutorMessage =
+ FUTURE_MESSAGE(Eq(RegisterExecutorMessage().GetTypeName()), _, _);
+
+ Future<TaskStatus> status;
+ EXPECT_CALL(sched, statusUpdate(_, _))
+ .WillOnce(FutureArg<1>(&status));
+
+ TaskInfo task;
+ task.set_name("test-task");
+ task.mutable_task_id()->set_value("1");
+ task.mutable_slave_id()->MergeFrom(offers->at(0).slave_id());
+ task.mutable_resources()->MergeFrom(offers->at(0).resources());
+ task.mutable_executor()->MergeFrom(DEFAULT_EXECUTOR_INFO);
+
+ driver.launchTasks(offers->at(0).id(), {task});
+
+ AWAIT_READY(registerExecutorMessage);
+
+ AWAIT_READY(status);
+ EXPECT_EQ(TASK_RUNNING, status->state());
+
+ // Now spoof an executor re-registration, the executor
+ // should be shut down.
+ Future<Nothing> executorShutdown;
+ EXPECT_CALL(exec, shutdown(_))
+ .WillOnce(FutureSatisfy(&executorShutdown));
+
+ UPID executorPid = registerExecutorMessage->from;
+ UPID agentPid = registerExecutorMessage->to;
+
+ ReregisterExecutorMessage reregisterExecutorMessage;
+ reregisterExecutorMessage.mutable_executor_id()->CopyFrom(
+ task.executor().executor_id());
+ reregisterExecutorMessage.mutable_framework_id()->CopyFrom(
+ frameworkId);
+
+ process::post(executorPid, agentPid, reregisterExecutorMessage);
+
+ AWAIT_READY(executorShutdown);
+
+ driver.stop();
+ driver.join();
+}
+
} // namespace tests {
} // namespace internal {
} // namespace mesos {