You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dl...@apache.org on 2015/05/26 21:19:54 UTC
svn commit: r1681818 [1/3] - in /mesos/site: publish/
publish/documentation/committing/ publish/documentation/configuration/
publish/documentation/docker-containerizer/
publish/documentation/latest/committing/
publish/documentation/latest/configuration...
Author: dlester
Date: Tue May 26 19:19:53 2015
New Revision: 1681818
URL: http://svn.apache.org/r1681818
Log:
Updates Mesos documentaiton on website.
Modified:
mesos/site/publish/documentation/committing/index.html
mesos/site/publish/documentation/configuration/index.html
mesos/site/publish/documentation/docker-containerizer/index.html
mesos/site/publish/documentation/latest/committing/index.html
mesos/site/publish/documentation/latest/configuration/index.html
mesos/site/publish/documentation/latest/docker-containerizer/index.html
mesos/site/publish/documentation/latest/powered-by-mesos/index.html
mesos/site/publish/documentation/powered-by-mesos/index.html
mesos/site/publish/sitemap.xml
mesos/site/source/documentation/latest/committing.md
mesos/site/source/documentation/latest/configuration.md
mesos/site/source/documentation/latest/docker-containerizer.md
mesos/site/source/documentation/latest/powered-by-mesos.md
Modified: mesos/site/publish/documentation/committing/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/committing/index.html?rev=1681818&r1=1681817&r2=1681818&view=diff
==============================================================================
--- mesos/site/publish/documentation/committing/index.html (original)
+++ mesos/site/publish/documentation/committing/index.html Tue May 26 19:19:53 2015
@@ -89,6 +89,8 @@ work with one during code review to get
<p>If you are a committer, here are some guidelines for committing changes:</p>
<ol>
+<li><strong>Check the JIRA ticket</strong>: make sure there is no further discussion
+needed regarding the approach used in the patch.</li>
<li><strong>Follow the format of commit messages</strong>: we currently do not leverage
any tooling to enforce the format of messages, so:
Modified: mesos/site/publish/documentation/configuration/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/configuration/index.html?rev=1681818&r1=1681817&r2=1681818&view=diff
==============================================================================
--- mesos/site/publish/documentation/configuration/index.html (original)
+++ mesos/site/publish/documentation/configuration/index.html Tue May 26 19:19:53 2015
@@ -945,6 +945,43 @@ file:///path/to/file (where file contain
</tr>
<tr>
<td>
+ --[no-]docker_kill_orphans
+ </td>
+ <td>
+ Enable docker containerizer to kill orphaned containers.
+ You should consider setting this to false when you launch multiple
+ slaves in the same OS, to avoid one of the DockerContainerizer removing
+ docker tasks launched by other slaves. However you should also make sure
+ you enable checkpoint for the slave so the same slave id can be reused,
+ otherwise docker tasks on slave restart will not be cleaned up.
+ (default: true)
+ </td>
+ </tr>
+ <tr>
+ <td>
+ --docker_sock=VALUE
+ </td>
+ <td>
+ The UNIX socket path to be mounted into the docker executor container to
+ provide docker CLI access to the docker daemon. This must be the path used
+ by the slave's docker image.
+ (default: /var/run/docker.sock)
+ </td>
+ </tr>
+ <tr>
+ <td>
+ --docker_mesos_image=VALUE
+ </td>
+ <td>
+ The docker image used to launch this mesos slave instance.
+ If an image is specified, the docker containerizer assumes the slave
+ is running in a docker container, and launches executors with
+ docker containers in order to recover them when the slave restarts and
+ recovers.
+ </td>
+ </tr>
+ <tr>
+ <td>
--docker_sandbox_directory=VALUE
</td>
<td>
Modified: mesos/site/publish/documentation/docker-containerizer/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/docker-containerizer/index.html?rev=1681818&r1=1681817&r2=1681818&view=diff
==============================================================================
--- mesos/site/publish/documentation/docker-containerizer/index.html (original)
+++ mesos/site/publish/documentation/docker-containerizer/index.html Tue May 26 19:19:53 2015
@@ -118,18 +118,17 @@ Note that the Docker image is expected t
<p>1, Fetch all the files specified in the CommandInfo into the sandbox.
2, Pull the docker image from the remote repository.
-3, Run the docker image with the configured DockerInfo options, and map the sandbox directory into the Docker container and set the directory mapping to the MESOS_SANDBOX environment variable.
-4. Stream the docker logs into the stdout/stderr files in the sandbox.
-5. Launch the Command Executor to perform a docker wait on the container.
-6. On container exit or containerizer destroy, stop and remove the docker container.</p>
+3, Run the docker image with the Docker executor, and map the sandbox directory into the Docker container and set the directory mapping to the MESOS_SANDBOX environment variable.
+ The executor will also stream the container logs into stdout/stderr files in the sandbox.
+4. On container exit or containerizer destroy, stop and remove the docker container.</p>
-<p>The Docker Containerizer launches all containers with the “mesos-” prefix (ie: mesos-abcdefghji), and also assumes all containers with the “mesos-” prefix is managed by the slave and is free to stop or kill the containers.</p>
+<p>The Docker Containerizer launches all containers with the “mesos-” prefix plus the slave id (ie: mesos-slave1-abcdefghji), and also assumes all containers with the “mesos-” prefix is managed by the slave and is free to stop or kill the containers.</p>
<p>When launching the docker image as an Executor, the only difference is that it skips launching a command executor but just reaps on the docker container executor pid.</p>
-<p>Note that we currently default to host networking when running a docker image, to easier support running a docker image asn an Executor.</p>
+<p>Note that we currently default to host networking when running a docker image, to easier support running a docker image as an Executor.</p>
-<p>Also since we explicitly attempt to pull the image on launch, if the docker image is only installed locally but not avaialble on the remote repository the launch will fail as well.</p>
+<p>The containerizer also supports optional force pulling of the image, and if disabled the docker image will only be updated again if it’s not available on the host.</p>
<h2>Private Docker repository</h2>
@@ -145,6 +144,12 @@ set the HOME environment variable pointi
<p>To run a docker image with an entrypoint defined, the CommandInfo’s shell option must be set to false.
If shell option is set to true the Docker Containerizer will run the user’s command wrapped with /bin/sh -c which will also become parameters to the image entrypoint.</p>
+<h2>Recover Docker containers on slave recovery</h2>
+
+<p>The Docker containerizer supports recovering Docker containers when the slave restarts, which supports both when the slave is running in a Docker container or not.</p>
+
+<p>With the docker_mesos_image flag enabled, the Docker containerizer assumes the containerizer is running in a container itself and modifies the mechanism it recovers and launches docker containers accordingly.</p>
+
</div>
</div>
Modified: mesos/site/publish/documentation/latest/committing/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/committing/index.html?rev=1681818&r1=1681817&r2=1681818&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/committing/index.html (original)
+++ mesos/site/publish/documentation/latest/committing/index.html Tue May 26 19:19:53 2015
@@ -89,6 +89,8 @@ work with one during code review to get
<p>If you are a committer, here are some guidelines for committing changes:</p>
<ol>
+<li><strong>Check the JIRA ticket</strong>: make sure there is no further discussion
+needed regarding the approach used in the patch.</li>
<li><strong>Follow the format of commit messages</strong>: we currently do not leverage
any tooling to enforce the format of messages, so:
Modified: mesos/site/publish/documentation/latest/configuration/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/configuration/index.html?rev=1681818&r1=1681817&r2=1681818&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/configuration/index.html (original)
+++ mesos/site/publish/documentation/latest/configuration/index.html Tue May 26 19:19:53 2015
@@ -945,6 +945,43 @@ file:///path/to/file (where file contain
</tr>
<tr>
<td>
+ --[no-]docker_kill_orphans
+ </td>
+ <td>
+ Enable docker containerizer to kill orphaned containers.
+ You should consider setting this to false when you launch multiple
+ slaves in the same OS, to avoid one of the DockerContainerizer removing
+ docker tasks launched by other slaves. However you should also make sure
+ you enable checkpoint for the slave so the same slave id can be reused,
+ otherwise docker tasks on slave restart will not be cleaned up.
+ (default: true)
+ </td>
+ </tr>
+ <tr>
+ <td>
+ --docker_sock=VALUE
+ </td>
+ <td>
+ The UNIX socket path to be mounted into the docker executor container to
+ provide docker CLI access to the docker daemon. This must be the path used
+ by the slave's docker image.
+ (default: /var/run/docker.sock)
+ </td>
+ </tr>
+ <tr>
+ <td>
+ --docker_mesos_image=VALUE
+ </td>
+ <td>
+ The docker image used to launch this mesos slave instance.
+ If an image is specified, the docker containerizer assumes the slave
+ is running in a docker container, and launches executors with
+ docker containers in order to recover them when the slave restarts and
+ recovers.
+ </td>
+ </tr>
+ <tr>
+ <td>
--docker_sandbox_directory=VALUE
</td>
<td>
Modified: mesos/site/publish/documentation/latest/docker-containerizer/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/docker-containerizer/index.html?rev=1681818&r1=1681817&r2=1681818&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/docker-containerizer/index.html (original)
+++ mesos/site/publish/documentation/latest/docker-containerizer/index.html Tue May 26 19:19:53 2015
@@ -118,18 +118,17 @@ Note that the Docker image is expected t
<p>1, Fetch all the files specified in the CommandInfo into the sandbox.
2, Pull the docker image from the remote repository.
-3, Run the docker image with the configured DockerInfo options, and map the sandbox directory into the Docker container and set the directory mapping to the MESOS_SANDBOX environment variable.
-4. Stream the docker logs into the stdout/stderr files in the sandbox.
-5. Launch the Command Executor to perform a docker wait on the container.
-6. On container exit or containerizer destroy, stop and remove the docker container.</p>
+3, Run the docker image with the Docker executor, and map the sandbox directory into the Docker container and set the directory mapping to the MESOS_SANDBOX environment variable.
+ The executor will also stream the container logs into stdout/stderr files in the sandbox.
+4. On container exit or containerizer destroy, stop and remove the docker container.</p>
-<p>The Docker Containerizer launches all containers with the “mesos-” prefix (ie: mesos-abcdefghji), and also assumes all containers with the “mesos-” prefix is managed by the slave and is free to stop or kill the containers.</p>
+<p>The Docker Containerizer launches all containers with the “mesos-” prefix plus the slave id (ie: mesos-slave1-abcdefghji), and also assumes all containers with the “mesos-” prefix is managed by the slave and is free to stop or kill the containers.</p>
<p>When launching the docker image as an Executor, the only difference is that it skips launching a command executor but just reaps on the docker container executor pid.</p>
-<p>Note that we currently default to host networking when running a docker image, to easier support running a docker image asn an Executor.</p>
+<p>Note that we currently default to host networking when running a docker image, to easier support running a docker image as an Executor.</p>
-<p>Also since we explicitly attempt to pull the image on launch, if the docker image is only installed locally but not avaialble on the remote repository the launch will fail as well.</p>
+<p>The containerizer also supports optional force pulling of the image, and if disabled the docker image will only be updated again if it’s not available on the host.</p>
<h2>Private Docker repository</h2>
@@ -145,6 +144,12 @@ set the HOME environment variable pointi
<p>To run a docker image with an entrypoint defined, the CommandInfo’s shell option must be set to false.
If shell option is set to true the Docker Containerizer will run the user’s command wrapped with /bin/sh -c which will also become parameters to the image entrypoint.</p>
+<h2>Recover Docker containers on slave recovery</h2>
+
+<p>The Docker containerizer supports recovering Docker containers when the slave restarts, which supports both when the slave is running in a Docker container or not.</p>
+
+<p>With the docker_mesos_image flag enabled, the Docker containerizer assumes the containerizer is running in a container itself and modifies the mechanism it recovers and launches docker containers accordingly.</p>
+
</div>
</div>
Modified: mesos/site/publish/documentation/latest/powered-by-mesos/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/latest/powered-by-mesos/index.html?rev=1681818&r1=1681817&r2=1681818&view=diff
==============================================================================
--- mesos/site/publish/documentation/latest/powered-by-mesos/index.html (original)
+++ mesos/site/publish/documentation/latest/powered-by-mesos/index.html Tue May 26 19:19:53 2015
@@ -87,6 +87,7 @@
<ul>
<li><a href="http://www.airbnb.com">Airbnb</a></li>
+<li><a href="http://allegrotech.io">Allegro</a></li>
<li><a href="http://www.altocloud.com/">Altocloud</a></li>
<li><a href="http://www.apple.com">Apple</a></li>
<li><a href="http://www.artirix.com">Artirix</a></li>
Modified: mesos/site/publish/documentation/powered-by-mesos/index.html
URL: http://svn.apache.org/viewvc/mesos/site/publish/documentation/powered-by-mesos/index.html?rev=1681818&r1=1681817&r2=1681818&view=diff
==============================================================================
--- mesos/site/publish/documentation/powered-by-mesos/index.html (original)
+++ mesos/site/publish/documentation/powered-by-mesos/index.html Tue May 26 19:19:53 2015
@@ -87,6 +87,7 @@
<ul>
<li><a href="http://www.airbnb.com">Airbnb</a></li>
+<li><a href="http://allegrotech.io">Allegro</a></li>
<li><a href="http://www.altocloud.com/">Altocloud</a></li>
<li><a href="http://www.apple.com">Apple</a></li>
<li><a href="http://www.artirix.com">Artirix</a></li>