You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/06/15 19:52:29 UTC
[2/2] mesos git commit: Added test for isolator cleanup before
prepare.
Added test for isolator cleanup before prepare.
Review: https://reviews.apache.org/r/46594/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/294dbc37
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/294dbc37
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/294dbc37
Branch: refs/heads/master
Commit: 294dbc37d7113aa49903487562f8c6349751d903
Parents: 89e771d
Author: Gilbert Song <so...@gmail.com>
Authored: Wed Jun 15 12:52:21 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jun 15 12:52:21 2016 -0700
----------------------------------------------------------------------
.../containerizer/mesos_containerizer_tests.cpp | 102 +++++++++++++++++++
1 file changed, 102 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/294dbc37/src/tests/containerizer/mesos_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/mesos_containerizer_tests.cpp b/src/tests/containerizer/mesos_containerizer_tests.cpp
index f0f83b3..6c14f6e 100644
--- a/src/tests/containerizer/mesos_containerizer_tests.cpp
+++ b/src/tests/containerizer/mesos_containerizer_tests.cpp
@@ -1026,6 +1026,108 @@ TEST_F(MesosContainerizerProvisionerTest, DestroyWhileProvisioningVolumeImage)
}
+// This test verifies that isolator cleanup will not be invoked
+// if the containerizer destroy a container while it is provisioning
+// an image, because isolators are not prepared yet.
+TEST_F(MesosContainerizerProvisionerTest, IsolatorCleanupBeforePrepare)
+{
+ slave::Flags flags = CreateSlaveFlags();
+
+ Try<Launcher*> launcher_ = PosixLauncher::create(flags);
+ ASSERT_SOME(launcher_);
+
+ TestLauncher* launcher = new TestLauncher(Owned<Launcher>(launcher_.get()));
+
+ MockProvisioner* provisioner = new MockProvisioner();
+
+ Future<Nothing> provision;
+ Promise<ProvisionInfo> promise;
+
+ EXPECT_CALL(*provisioner, provision(_, _))
+ .WillOnce(DoAll(FutureSatisfy(&provision),
+ Return(promise.future())));
+
+ EXPECT_CALL(*provisioner, destroy(_))
+ .WillOnce(Return(true));
+
+ MockIsolator* isolator = new MockIsolator();
+
+ EXPECT_CALL(*isolator, cleanup(_))
+ .Times(0);
+
+ Fetcher fetcher;
+
+ Try<ContainerLogger*> logger =
+ ContainerLogger::create(flags.container_logger);
+
+ ASSERT_SOME(logger);
+
+ MesosContainerizerProcess* process = new MesosContainerizerProcess(
+ flags,
+ true,
+ &fetcher,
+ Owned<ContainerLogger>(logger.get()),
+ Owned<Launcher>(launcher),
+ Owned<Provisioner>(provisioner),
+ {Owned<Isolator>(isolator)});
+
+ MesosContainerizer containerizer((Owned<MesosContainerizerProcess>(process)));
+
+ ContainerID containerId;
+ containerId.set_value(UUID::random().toString());
+
+ TaskInfo taskInfo;
+ CommandInfo commandInfo;
+ taskInfo.mutable_command()->MergeFrom(commandInfo);
+
+ Image image;
+ image.set_type(Image::DOCKER);
+ Image::Docker dockerImage;
+ dockerImage.set_name(UUID::random().toString());
+ image.mutable_docker()->CopyFrom(dockerImage);
+
+ ContainerInfo::MesosInfo mesosInfo;
+ mesosInfo.mutable_image()->CopyFrom(image);
+
+ ContainerInfo containerInfo;
+ containerInfo.set_type(ContainerInfo::MESOS);
+ containerInfo.mutable_mesos()->CopyFrom(mesosInfo);
+
+ ExecutorInfo executorInfo = CREATE_EXECUTOR_INFO("executor", "exit 0");
+ executorInfo.mutable_container()->CopyFrom(containerInfo);
+
+ Future<bool> launch = containerizer.launch(
+ containerId,
+ taskInfo,
+ executorInfo,
+ os::getcwd(),
+ None(),
+ SlaveID(),
+ PID<Slave>(),
+ false);
+
+ Future<containerizer::Termination> wait = containerizer.wait(containerId);
+
+ AWAIT_READY(provision);
+
+ containerizer.destroy(containerId);
+
+ ASSERT_TRUE(wait.isPending());
+ promise.set(ProvisionInfo{"rootfs", None()});
+
+ AWAIT_FAILED(launch);
+ AWAIT_READY(wait);
+
+ containerizer::Termination termination = wait.get();
+
+ EXPECT_EQ(
+ "Container destroyed while provisioning images",
+ termination.message());
+
+ EXPECT_FALSE(termination.has_status());
+}
+
+
// This action destroys the container using the real launcher and
// waits until the destroy is complete.
ACTION_P(InvokeDestroyAndWait, launcher)