Made Docker::ps/rm default arguments match CLI defaults.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a54dda8a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a54dda8a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a54dda8a Branch: refs/heads/master Commit: a54dda8a49d49265255580241a80edb68b4d76f4 Parents: 38e4752 Author: Benjamin Hindman <[email protected]> Authored: Sun Jun 29 17:57:28 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:16 2014 -0700 ---------------------------------------------------------------------- src/docker/docker.hpp | 4 ++-- src/slave/containerizer/docker.cpp | 9 +++++---- src/tests/docker_containerizer_tests.cpp | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a54dda8a/src/docker/docker.hpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.hpp b/src/docker/docker.hpp index 6643036..2957e92 100644 --- a/src/docker/docker.hpp +++ b/src/docker/docker.hpp @@ -71,7 +71,7 @@ public: // Performs 'docker rm (-f) CONTAINER'. process::Future<Option<int> > rm( const std::string& container, - const bool force = true) const; + const bool force = false) const; // Performs 'docker inspect CONTAINER'. process::Future<Container> inspect( @@ -79,7 +79,7 @@ public: // Performs 'docker ps (-a)'. process::Future<std::list<Container> > ps( - const bool all = true) const; + const bool all = false) const; process::Future<std::string> info() const; http://git-wip-us.apache.org/repos/asf/mesos/blob/a54dda8a/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 24255e6..5026082 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -409,8 +409,9 @@ Future<Nothing> DockerContainerizerProcess::recover( } } - // Get the list of Docker containers in order to Remove any orphans. - return docker.ps() + // Get the list of all Docker containers (running and exited) in + // order to remove any orphans. + return docker.ps(true) .then(defer(self(), &Self::_recover, lambda::_1)); } @@ -437,7 +438,7 @@ Future<Nothing> DockerContainerizerProcess::_recover( if (!statuses.keys().contains(id.get())) { // TODO(benh): Retry 'docker rm -f' if it failed but the container // still exists (asynchronously). - docker.rm(container.id()); + docker.rm(container.id(), true); } } @@ -705,7 +706,7 @@ void DockerContainerizerProcess::destroy( // TODO(benh): Retry 'docker rm -f' if it failed but the container // still exists (asynchronously). - docker.rm(DOCKER_NAME_PREFIX + stringify(containerId)) + docker.rm(DOCKER_NAME_PREFIX + stringify(containerId), true) .onAny(defer(self(), &Self::_destroy, containerId, killed, lambda::_1)); } http://git-wip-us.apache.org/repos/asf/mesos/blob/a54dda8a/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index b716de4..274eee7 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -147,7 +147,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch) AWAIT_READY_FOR(statusRunning, Seconds(60)); EXPECT_EQ(TASK_RUNNING, statusRunning.get().state()); - Future<list<Docker::Container> > containers = docker.ps(); + Future<list<Docker::Container> > containers = docker.ps(true); AWAIT_READY(containers);
