You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2018/03/28 23:36:51 UTC
mesos git commit: Clarified usage of docker_remove_delay flag.
Repository: mesos
Updated Branches:
refs/heads/master 97c601713 -> bc6265d9a
Clarified usage of docker_remove_delay flag.
This closes #278
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bc6265d9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bc6265d9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bc6265d9
Branch: refs/heads/master
Commit: bc6265d9aeaacdb5a6d229750208c3a31e541692
Parents: 97c6017
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Wed Mar 28 16:35:49 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Wed Mar 28 16:35:49 2018 -0700
----------------------------------------------------------------------
docs/configuration/agent.md | 5 +++--
src/slave/flags.cpp | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bc6265d9/docs/configuration/agent.md
----------------------------------------------------------------------
diff --git a/docs/configuration/agent.md b/docs/configuration/agent.md
index 13e4c55..18857e2 100644
--- a/docs/configuration/agent.md
+++ b/docs/configuration/agent.md
@@ -603,9 +603,10 @@ containerizer. (default: https://registry-1.docker.io)
--docker_remove_delay=VALUE
</td>
<td>
-The amount of time to wait before removing docker containers
+The amount of time to wait before removing docker containers (i.e., `docker rm`)
+after Mesos regards the container as TERMINATED
(e.g., <code>3days</code>, <code>2weeks</code>, etc).
-(default: 6hrs)
+This only applies for the Docker Containerizer. (default: 6hrs)
</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/mesos/blob/bc6265d9/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 962b07c..005ce7f 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -810,8 +810,10 @@ mesos::internal::slave::Flags::Flags()
add(&Flags::docker_remove_delay,
"docker_remove_delay",
- "The amount of time to wait before removing docker containers\n"
- "(e.g., `3days`, `2weeks`, etc).\n",
+ "The amount of time to wait before removing docker containers \n"
+ "(i.e., `docker rm`) after Mesos regards the container as TERMINATED\n"
+ "(e.g., `3days`, `2weeks`, etc). This only applies for the Docker\n"
+ "Containerizer.\n",
DOCKER_REMOVE_DELAY);
add(&Flags::docker_kill_orphans,