[02/43] git commit: Changed docker.kill() to docker.rm().

[be...@apache.org]

Changed docker.kill() to docker.rm().

Since we actually want to destroy the container, so we need
to delete the container after killing it. We can do this by
calling docker.rm(), which by default does a 'docker rm -f'.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1bb4bd7c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1bb4bd7c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1bb4bd7c

Branch: refs/heads/master
Commit: 1bb4bd7c6c3aab4d5c698f411e48ceba986f1fce
Parents: 286e78b
Author: Yifan Gu <gu...@gmail.com>
Authored: Fri Jun 27 01:04:19 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Mon Aug 4 15:08:15 2014 -0700

----------------------------------------------------------------------
 src/slave/containerizer/docker.cpp       | 14 +++++++-------
 src/tests/docker_containerizer_tests.cpp |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/1bb4bd7c/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 851b663..3c7f810 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -425,11 +425,11 @@ Future<Nothing> DockerContainerizerProcess::_recover(
             << stringify(id.get()) << "' has been orphaned";
 
     // Check if we're watching an executor for this container ID and
-    // if not, kill the Docker container.
+    // if not, rm -f the Docker container.
     if (!statuses.keys().contains(id.get())) {
-      // TODO(benh): Retry 'docker kill' if it failed but the container
+      // TODO(benh): Retry 'docker rm -f' if it failed but the container
       // still exists (asynchronously).
-      docker.kill(container.id());
+      docker.rm(container.id());
     }
   }
 
@@ -658,7 +658,7 @@ void DockerContainerizerProcess::destroy(
 
   LOG(INFO) << "Destroying container '" << containerId << "'";
 
-  // Do a 'docker kill' which we'll then find out about in '_wait'
+  // Do a 'docker rm -f' which we'll then find out about in '_wait'
   // after the mesos-executor exits because it's doing a 'docker wait'
   // (via --override).
   //
@@ -667,11 +667,11 @@ void DockerContainerizerProcess::destroy(
   // 'statuses') but if that is the case then we're doing a destroy
   // because we failed to launch the mesos-executor (see defer at
   // bottom of 'launch') so no need to do anything after a successful
-  // 'docker kill'.
+  // 'docker rm -f'.
 
-  // TODO(benh): Retry 'docker kill' if it failed but the container
+  // TODO(benh): Retry 'docker rm -f' if it failed but the container
   // still exists (asynchronously).
-  docker.kill(DOCKER_NAME_PREFIX + stringify(containerId))
+  docker.rm(DOCKER_NAME_PREFIX + stringify(containerId))
     .onAny(defer(self(), &Self::_destroy, containerId, killed, lambda::_1));
 }
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/1bb4bd7c/src/tests/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp
index 636187f..a6ba9da 100644
--- a/src/tests/docker_containerizer_tests.cpp
+++ b/src/tests/docker_containerizer_tests.cpp
@@ -165,7 +165,7 @@ TEST_F(DockerContainerizerTest, DOCKER_Launch)
 
   ASSERT_TRUE(foundContainer);
 
-  AWAIT_READY(docker.kill(expectedName));
+  dockerContainer.destroy(dockerContainer.lastContainerId);
 
   driver.stop();
   driver.join();