You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2018/02/26 07:24:27 UTC
[11/12] mesos git commit: Added test to check quotes in Docker
executor health check.
Added test to check quotes in Docker executor health check.
Added `ROOT_DOCKER_DockerHealthyTaskWithQuotedCommand` to make sure that
the Docker executor properly deals with quotes in the command health
check to ensure that MESOS-4812 is fixed.
Review: https://reviews.apache.org/r/65728/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8098ac23
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8098ac23
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8098ac23
Branch: refs/heads/master
Commit: 8098ac239563f5770b57d2db65514f4923738c76
Parents: 794d6f8
Author: Akash Gupta <ak...@hotmail.com>
Authored: Sun Feb 25 13:41:15 2018 -0800
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Sun Feb 25 22:13:32 2018 -0800
----------------------------------------------------------------------
src/tests/health_check_tests.cpp | 132 ++++++++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8098ac23/src/tests/health_check_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/health_check_tests.cpp b/src/tests/health_check_tests.cpp
index 6cdfe97..c4661b4 100644
--- a/src/tests/health_check_tests.cpp
+++ b/src/tests/health_check_tests.cpp
@@ -2651,6 +2651,138 @@ TEST_F(DockerContainerizerHealthCheckTest, ROOT_DOCKER_DockerHealthStatusChange)
}
}
+
+// This test verifies that tasks with quotes in the `COMMAND` health check
+// work for the Docker executor.
+TEST_F(
+ DockerContainerizerHealthCheckTest,
+ ROOT_DOCKER_DockerHealthyTaskWithQuotedCommand)
+{
+ Shared<Docker> docker(
+ new MockDocker(tests::flags.docker, tests::flags.docker_socket));
+
+ Try<Nothing> validateResult = docker->validateVersion(Version(1, 3, 0));
+ ASSERT_SOME(validateResult)
+ << "-------------------------------------------------------------\n"
+ << "We cannot run this test because of 'docker exec' command \n"
+ << "require docker version greater than '1.3.0'. You won't be \n"
+ << "able to use the docker exec method, but feel free to disable\n"
+ << "this test.\n"
+ << "-------------------------------------------------------------";
+
+ Try<Owned<cluster::Master>> master = StartMaster();
+ ASSERT_SOME(master);
+
+ slave::Flags agentFlags = CreateSlaveFlags();
+
+ Fetcher fetcher(agentFlags);
+
+ Try<ContainerLogger*> logger =
+ ContainerLogger::create(agentFlags.container_logger);
+
+ ASSERT_SOME(logger);
+
+ MockDockerContainerizer containerizer(
+ agentFlags,
+ &fetcher,
+ Owned<ContainerLogger>(logger.get()),
+ docker);
+
+ Owned<MasterDetector> detector = master.get()->createDetector();
+ Try<Owned<cluster::Slave>> agent =
+ StartSlave(detector.get(), &containerizer, agentFlags);
+ ASSERT_SOME(agent);
+
+ MockScheduler sched;
+ MesosSchedulerDriver driver(
+ &sched, DEFAULT_FRAMEWORK_INFO, master.get()->pid, DEFAULT_CREDENTIAL);
+
+ EXPECT_CALL(sched, registered(&driver, _, _));
+
+ Future<vector<Offer>> offers;
+ EXPECT_CALL(sched, resourceOffers(&driver, _))
+ .WillOnce(FutureArg<1>(&offers))
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
+
+ driver.start();
+
+ AWAIT_READY(offers);
+ ASSERT_FALSE(offers->empty());
+
+ TaskInfo task = createTask(offers.get()[0], DOCKER_SLEEP_CMD(120));
+
+ // TODO(akagup): Use local image to test if possible.
+ ContainerInfo containerInfo;
+ containerInfo.set_type(ContainerInfo::DOCKER);
+ containerInfo.mutable_docker()->set_image(DOCKER_TEST_IMAGE);
+
+ task.mutable_container()->CopyFrom(containerInfo);
+
+ HealthCheck healthCheck;
+ healthCheck.set_type(HealthCheck::COMMAND);
+ healthCheck.mutable_command()->set_value("echo '\"'");
+ healthCheck.set_delay_seconds(0);
+ healthCheck.set_interval_seconds(0);
+ healthCheck.set_grace_period_seconds(0);
+
+ task.mutable_health_check()->CopyFrom(healthCheck);
+
+ Future<ContainerID> containerId;
+ EXPECT_CALL(containerizer, launch(_, _, _, _))
+ .WillOnce(DoAll(
+ FutureArg<0>(&containerId),
+ Invoke(&containerizer, &MockDockerContainerizer::_launch)));
+
+ Future<TaskStatus> statusStarting;
+ Future<TaskStatus> statusRunning;
+ Future<TaskStatus> statusHealthy;
+
+ EXPECT_CALL(sched, statusUpdate(&driver, _))
+ .WillOnce(FutureArg<1>(&statusStarting))
+ .WillOnce(FutureArg<1>(&statusRunning))
+ .WillOnce(FutureArg<1>(&statusHealthy));
+
+ driver.launchTasks(offers.get()[0].id(), {task});
+
+ AWAIT_READY(containerId);
+
+ AWAIT_READY(statusStarting);
+ EXPECT_EQ(TASK_STARTING, statusStarting->state());
+
+ AWAIT_READY(statusRunning);
+ EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+
+ AWAIT_READY(statusHealthy);
+ EXPECT_EQ(TASK_RUNNING, statusHealthy->state());
+ EXPECT_EQ(
+ TaskStatus::REASON_TASK_HEALTH_CHECK_STATUS_UPDATED,
+ statusHealthy->reason());
+ EXPECT_TRUE(statusHealthy->has_healthy());
+ EXPECT_TRUE(statusHealthy->healthy());
+
+ Future<Option<ContainerTermination>> termination =
+ containerizer.wait(containerId.get());
+
+ driver.stop();
+ driver.join();
+
+ AWAIT_READY(termination);
+ EXPECT_SOME(termination.get());
+
+ agent.get()->terminate();
+ agent->reset();
+
+ Future<std::list<Docker::Container>> containers =
+ docker->ps(true, slave::DOCKER_NAME_PREFIX);
+
+ AWAIT_READY(containers);
+
+ // Cleanup all mesos launched containers.
+ foreach (const Docker::Container& container, containers.get()) {
+ AWAIT_READY_FOR(docker->rm(container.id, true), Seconds(30));
+ }
+}
+
} // namespace tests {
} // namespace internal {
} // namespace mesos {