You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2015/09/25 18:33:06 UTC
[14/17] mesos git commit: Fix docker provisioner tests.
Fix docker provisioner tests.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f392f752
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f392f752
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f392f752
Branch: refs/heads/master
Commit: f392f752fd796939184229b4d819fb1e58423290
Parents: fb2df96
Author: Timothy Chen <tn...@gmail.com>
Authored: Tue Sep 8 19:50:11 2015 +0000
Committer: Timothy Chen <tn...@apache.org>
Committed: Fri Sep 25 09:02:05 2015 -0700
----------------------------------------------------------------------
src/messages/docker_provisioner.hpp | 6 ++---
.../containerizer/provisioner/provisioner.hpp | 2 +-
src/slave/containerizer/provisioners/docker.hpp | 6 ++---
.../provisioners/docker/local_store.cpp | 2 +-
.../containerizer/provisioner_docker_tests.cpp | 28 ++++++++------------
5 files changed, 19 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f392f752/src/messages/docker_provisioner.hpp
----------------------------------------------------------------------
diff --git a/src/messages/docker_provisioner.hpp b/src/messages/docker_provisioner.hpp
index b076fdb..684bd46 100644
--- a/src/messages/docker_provisioner.hpp
+++ b/src/messages/docker_provisioner.hpp
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-#ifndef __DOCKER_PROVISIONER_HPP__
-#define __DOCKER_PROVISIONER_HPP__
+#ifndef __MESSAGES_DOCKER_PROVISIONER_HPP__
+#define __MESSAGES_DOCKER_PROVISIONER_HPP__
#include "messages/docker_provisioner.pb.h"
-#endif // __DOCKER_PROVISIONER_HPP__
+#endif // __MESSAGES_DOCKER_PROVISIONER_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/f392f752/src/slave/containerizer/provisioner/provisioner.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/provisioner/provisioner.hpp b/src/slave/containerizer/provisioner/provisioner.hpp
index 912fc5a..d42822b 100644
--- a/src/slave/containerizer/provisioner/provisioner.hpp
+++ b/src/slave/containerizer/provisioner/provisioner.hpp
@@ -67,7 +67,7 @@ public:
// image and return the absolute path to the root filesystem.
virtual process::Future<std::string> provision(
const ContainerID& containerId,
- const Image& image);
+ const Image& image) = 0;
// Destroy a previously provisioned root filesystem. Assumes that
// all references (e.g., mounts, open files) to the provisioned
http://git-wip-us.apache.org/repos/asf/mesos/blob/f392f752/src/slave/containerizer/provisioners/docker.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/provisioners/docker.hpp b/src/slave/containerizer/provisioners/docker.hpp
index 35e23c9..d3ada9d 100644
--- a/src/slave/containerizer/provisioners/docker.hpp
+++ b/src/slave/containerizer/provisioners/docker.hpp
@@ -96,10 +96,10 @@ struct DockerImage
// Forward declaration.
class DockerProvisionerProcess;
-class DockerProvisioner : public Provisioner
+class DockerProvisioner : public mesos::internal::slave::Provisioner
{
public:
- static Try<process::Owned<Provisioner>> create(
+ static Try<process::Owned<mesos::internal::slave::Provisioner>> create(
const Flags& flags,
Fetcher* fetcher);
@@ -116,7 +116,7 @@ public:
virtual process::Future<bool> destroy(const ContainerID& containerId);
private:
- explicit DockerProvisioner(process::Owned<DockerProvisionerProcess> process);
+ explicit DockerProvisioner(process::Owned<DockerProvisionerProcess> _process);
DockerProvisioner(const DockerProvisioner&); // Not copyable.
DockerProvisioner& operator=(const DockerProvisioner&); // Not assignable.
http://git-wip-us.apache.org/repos/asf/mesos/blob/f392f752/src/slave/containerizer/provisioners/docker/local_store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/provisioners/docker/local_store.cpp b/src/slave/containerizer/provisioners/docker/local_store.cpp
index c6a9efe..80b5b06 100644
--- a/src/slave/containerizer/provisioners/docker/local_store.cpp
+++ b/src/slave/containerizer/provisioners/docker/local_store.cpp
@@ -187,7 +187,7 @@ Future<DockerImage> LocalStoreProcess::get(const string& name)
{
return refStore->get(name)
.then(defer(self(),
- [this, &name](
+ [this, name](
const Option<DockerImage>& image) -> Future<DockerImage> {
if (image.isSome()) {
return image.get();
http://git-wip-us.apache.org/repos/asf/mesos/blob/f392f752/src/tests/containerizer/provisioner_docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp
index 3a9a6ec..e1a311b 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -701,17 +701,17 @@ public:
const slave::Flags& flags,
const DockerImage& dockerImage)
{
+ string layersPath = path::join(flags.docker_store_dir, "layers");
+
// Verify contents of the image in store directory.
- EXPECT_TRUE(
- os::exists(path::join(flags.docker_store_dir, "123", "rootfs")));
- EXPECT_TRUE(
- os::exists(path::join(flags.docker_store_dir, "456", "rootfs")));
+ EXPECT_TRUE(os::exists(path::join(layersPath, "123", "rootfs")));
+ EXPECT_TRUE(os::exists(path::join(layersPath, "456", "rootfs")));
EXPECT_SOME_EQ(
"foo 123",
- os::read(path::join(flags.docker_store_dir, "123", "rootfs" , "temp")));
+ os::read(path::join(layersPath, "123", "rootfs" , "temp")));
EXPECT_SOME_EQ(
"bar 456",
- os::read(path::join(flags.docker_store_dir, "456", "rootfs", "temp")));
+ os::read(path::join(layersPath, "456", "rootfs", "temp")));
// Verify the Docker Image provided.
EXPECT_EQ(dockerImage.imageName, "abc");
@@ -804,15 +804,10 @@ TEST_F(DockerProvisionerLocalStoreTest, LocalStoreTestWithTar)
string sandbox = path::join(os::getcwd(), "sandbox");
ASSERT_SOME(os::mkdir(sandbox));
- Future<DockerImage> dockerImage = store.get()->put("abc", sandbox);
+ Future<DockerImage> dockerImage = store.get()->get("abc");
AWAIT_READY(dockerImage);
verifyLocalDockerImage(flags, dockerImage.get());
-
- Future<Option<DockerImage>> dockerImageOption = store.get()->get("abc");
- AWAIT_READY(dockerImageOption);
- ASSERT_SOME(dockerImageOption.get());
- verifyLocalDockerImage(flags, dockerImageOption.get().get());
}
// This tests the ability of the reference store to recover the images it has
@@ -832,7 +827,7 @@ TEST_F(DockerProvisionerLocalStoreTest, ReferenceStoreInitialization)
string sandbox = path::join(os::getcwd(), "sandbox");
ASSERT_SOME(os::mkdir(sandbox));
- Future<DockerImage> dockerImage = store.get()->put("abc", sandbox);
+ Future<DockerImage> dockerImage = store.get()->get("abc");
AWAIT_READY(dockerImage);
// Store is deleted and recreated. Reference Store is initialized upon
@@ -841,10 +836,9 @@ TEST_F(DockerProvisionerLocalStoreTest, ReferenceStoreInitialization)
store = Store::create(flags, &fetcher);
ASSERT_SOME(store);
- Future<Option<DockerImage>> dockerImageOption = store.get()->get("abc");
- AWAIT_READY(dockerImageOption);
- ASSERT_SOME(dockerImageOption.get());
- verifyLocalDockerImage(flags, dockerImageOption.get().get());
+ dockerImage = store.get()->get("abc");
+ AWAIT_READY(dockerImage);
+ verifyLocalDockerImage(flags, dockerImage.get());
}
} // namespace tests {