Exposed and used the Docker container name prefix.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/57c1ec2d Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/57c1ec2d Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/57c1ec2d Branch: refs/heads/master Commit: 57c1ec2d45a01ca391ae234cf2cbb74fd37bd9cf Parents: 109296f Author: Benjamin Hindman <[email protected]> Authored: Sun Jun 29 13:42:02 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:16 2014 -0700 ---------------------------------------------------------------------- src/slave/containerizer/docker.cpp | 7 ++++--- src/slave/containerizer/docker.hpp | 6 ++++++ src/tests/docker_containerizer_tests.cpp | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/57c1ec2d/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 5968916..87510fa 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -55,9 +55,10 @@ using state::ExecutorState; using state::RunState; -// Prefix included in every Docker container created by Mesos to -// distinguish from Docker containers created manually. -static string DOCKER_NAME_PREFIX = "mesos-"; +// Declared in header, see explanation there. +// TODO(benh): At some point to run multiple slaves we'll need to make +// the Docker container name creation include the slave ID. +string DOCKER_NAME_PREFIX = "mesos-"; class DockerContainerizerProcess http://git-wip-us.apache.org/repos/asf/mesos/blob/57c1ec2d/src/slave/containerizer/docker.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.hpp b/src/slave/containerizer/docker.hpp index a6411e8..1a5d1c2 100644 --- a/src/slave/containerizer/docker.hpp +++ b/src/slave/containerizer/docker.hpp @@ -29,9 +29,15 @@ namespace mesos { namespace internal { namespace slave { +// Prefix used to name Docker containers in order to distinguish those +// created by Mesos from those created manually. +extern std::string DOCKER_NAME_PREFIX; + + // Forward declaration. class DockerContainerizerProcess; + class DockerContainerizer : public Containerizer { public: http://git-wip-us.apache.org/repos/asf/mesos/blob/57c1ec2d/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index cdf925d..17c4b1c 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -154,7 +154,8 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) ASSERT_TRUE(containers.get().size() > 0); bool foundContainer = false; - string expectedName = "mesos-" + dockerContainer.lastContainerId.value(); + string expectedName = + slave::DOCKER_NAME_PREFIX + dockerContainer.lastContainerId.value(); foreach (const Docker::Container& container, containers.get()) { // Docker inspect name contains an extra slash in the beginning.
