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/07/17 01:08:48 UTC
mesos git commit: Rename --docker_sandbox_directory flag for general
use.
Repository: mesos
Updated Branches:
refs/heads/master 661010c13 -> 6bd625748
Rename --docker_sandbox_directory flag for general use.
Review: https://reviews.apache.org/r/34908
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6bd62574
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6bd62574
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6bd62574
Branch: refs/heads/master
Commit: 6bd625748bf9e504275b47e8d1de2550e97e4266
Parents: 661010c
Author: Ian Downes <ia...@gmail.com>
Authored: Thu Jul 16 16:04:49 2015 -0700
Committer: Timothy Chen <tn...@apache.org>
Committed: Thu Jul 16 16:04:50 2015 -0700
----------------------------------------------------------------------
docs/configuration.md | 14 +++++++-------
src/slave/containerizer/docker.cpp | 4 ++--
src/slave/flags.cpp | 12 ++++++------
src/slave/flags.hpp | 2 +-
src/tests/docker_containerizer_tests.cpp | 4 ++--
5 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6bd62574/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index feee559..babbd2f 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -970,21 +970,21 @@ file:///path/to/file (where file contains one of the above)</code></pre>
</tr>
<tr>
<td>
- --docker_sandbox_directory=VALUE
+ --docker_stop_timeout=VALUE
</td>
<td>
- The absolute path for the directory in the container where the
- sandbox is mapped to.
- (default: /mnt/mesos/sandbox)
+ The time as a duration for docker to wait after stopping an instance
+ before it kills that instance. (default: 0secs)
</td>
</tr>
<tr>
<td>
- --docker_stop_timeout=VALUE
+ --sandbox_directory=VALUE
</td>
<td>
- The time as a duration for docker to wait after stopping an instance
- before it kills that instance. (default: 0secs)
+ The absolute path for the directory in the container where the
+ sandbox is mapped to.
+ (default: /mnt/mesos/sandbox)
</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/mesos/blob/6bd62574/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index e710876..8f5d302 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -183,7 +183,7 @@ docker::Flags dockerFlags(
dockerFlags.container = name;
dockerFlags.docker = flags.docker;
dockerFlags.sandbox_directory = directory;
- dockerFlags.mapped_directory = flags.docker_sandbox_directory;
+ dockerFlags.mapped_directory = flags.sandbox_directory;
dockerFlags.stop_timeout = flags.docker_stop_timeout;
return dockerFlags;
}
@@ -830,7 +830,7 @@ Future<Docker::Container> DockerContainerizerProcess::launchExecutorContainer(
container->command,
containerName,
container->directory,
- flags.docker_sandbox_directory,
+ flags.sandbox_directory,
container->resources,
container->environment,
path::join(container->directory, "stdout"),
http://git-wip-us.apache.org/repos/asf/mesos/blob/6bd62574/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 8632677..f569363 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -353,12 +353,6 @@ mesos::internal::slave::Flags::Flags()
"containerizer.\n",
"docker");
- add(&Flags::docker_sandbox_directory,
- "docker_sandbox_directory",
- "The absolute path for the directory in the container where the\n"
- "sandbox is mapped to.\n",
- "/mnt/mesos/sandbox");
-
add(&Flags::docker_remove_delay,
"docker_remove_delay",
"The amount of time to wait before removing docker containers\n"
@@ -391,6 +385,12 @@ mesos::internal::slave::Flags::Flags()
"path used by the slave's docker image.\n",
"/var/run/docker.sock");
+ add(&Flags::sandbox_directory,
+ "sandbox_directory",
+ "The absolute path for the directory in the container where the\n"
+ "sandbox is mapped to.\n",
+ "/mnt/mesos/sandbox");
+
add(&Flags::default_container_info,
"default_container_info",
"JSON formatted ContainerInfo that will be included into\n"
http://git-wip-us.apache.org/repos/asf/mesos/blob/6bd62574/src/slave/flags.hpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp
index 26c778d..bbc1b9e 100644
--- a/src/slave/flags.hpp
+++ b/src/slave/flags.hpp
@@ -90,8 +90,8 @@ public:
Option<std::string> default_container_image;
std::string docker;
Option<std::string> docker_mesos_image;
- std::string docker_sandbox_directory;
Duration docker_remove_delay;
+ std::string sandbox_directory;
Option<ContainerInfo> default_container_info;
Duration docker_stop_timeout;
bool docker_kill_orphans;
http://git-wip-us.apache.org/repos/asf/mesos/blob/6bd62574/src/tests/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp
index 6c6f4b7..dc87d9f 100644
--- a/src/tests/docker_containerizer_tests.cpp
+++ b/src/tests/docker_containerizer_tests.cpp
@@ -1191,7 +1191,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Recover)
commandInfo,
container1,
flags.work_dir,
- flags.docker_sandbox_directory,
+ flags.sandbox_directory,
resources);
Future<Nothing> d2 =
@@ -1200,7 +1200,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Recover)
commandInfo,
container2,
flags.work_dir,
- flags.docker_sandbox_directory,
+ flags.sandbox_directory,
resources);
ASSERT_TRUE(