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/09/11 00:51:58 UTC
mesos git commit: Added provisioner appc unit test for provisioning
nested container.
Repository: mesos
Updated Branches:
refs/heads/master 2fe5e5a7c -> fa73001b3
Added provisioner appc unit test for provisioning nested container.
Review: https://reviews.apache.org/r/51420/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fa73001b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fa73001b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fa73001b
Branch: refs/heads/master
Commit: fa73001b38351cff5a20ff34639838154068ab3d
Parents: 2fe5e5a
Author: Gilbert Song <so...@gmail.com>
Authored: Sat Sep 10 17:42:18 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Sat Sep 10 17:51:29 2016 -0700
----------------------------------------------------------------------
.../containerizer/provisioner_appc_tests.cpp | 67 ++++++++++++++++++++
1 file changed, 67 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/fa73001b/src/tests/containerizer/provisioner_appc_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp
index 6d04233..3ef9f05 100644
--- a/src/tests/containerizer/provisioner_appc_tests.cpp
+++ b/src/tests/containerizer/provisioner_appc_tests.cpp
@@ -339,6 +339,73 @@ TEST_F(ProvisionerAppcTest, ROOT_Provision)
// The container directory is successfully cleaned up.
EXPECT_FALSE(os::exists(containerDir));
}
+
+
+// This test verifies that the provisioner can provision an rootfs
+// from an image for a child container.
+TEST_F(ProvisionerAppcTest, ROOT_ProvisionNestedContainer)
+{
+ slave::Flags flags;
+ flags.image_providers = "APPC";
+ flags.appc_store_dir = path::join(os::getcwd(), "store");
+ flags.image_provisioner_backend = "bind";
+ flags.work_dir = path::join(sandbox.get(), "work_dir");
+
+ Try<Owned<Provisioner>> provisioner = Provisioner::create(flags);
+ ASSERT_SOME(provisioner);
+
+ Try<string> createImage = createTestImage(
+ flags.appc_store_dir,
+ getManifest());
+
+ ASSERT_SOME(createImage);
+
+ // Recover. This is when the image in the store is loaded.
+ AWAIT_READY(provisioner.get()->recover({}, {}));
+
+ Image image;
+ image.mutable_appc()->CopyFrom(getTestImage());
+
+ ContainerID parent;
+ ContainerID child;
+
+ parent.set_value(UUID::random().toString());
+ child.set_value(UUID::random().toString());
+ child.mutable_parent()->CopyFrom(parent);
+
+ Future<slave::ProvisionInfo> provisionInfo =
+ provisioner.get()->provision(child, image);
+
+ AWAIT_READY(provisionInfo);
+
+ const string provisionerDir = slave::paths::getProvisionerDir(flags.work_dir);
+
+ const string containerDir =
+ slave::provisioner::paths::getContainerDir(
+ provisionerDir,
+ child);
+
+ Try<hashmap<string, hashset<string>>> rootfses =
+ slave::provisioner::paths::listContainerRootfses(
+ provisionerDir,
+ child);
+
+ ASSERT_SOME(rootfses);
+
+ // Verify that the rootfs is successfully provisioned.
+ ASSERT_TRUE(rootfses->contains(flags.image_provisioner_backend));
+ ASSERT_EQ(1u, rootfses->get(flags.image_provisioner_backend)->size());
+ EXPECT_EQ(*rootfses->get(flags.image_provisioner_backend)->begin(),
+ Path(provisionInfo.get().rootfs).basename());
+
+ // TODO(jieyu): Verify that 'containerDir' is nested under its
+ // parent container's 'containerDir'.
+
+ Future<bool> destroy = provisioner.get()->destroy(child);
+ AWAIT_READY(destroy);
+ EXPECT_TRUE(destroy.get());
+ EXPECT_FALSE(os::exists(containerDir));
+}
#endif // __linux__