You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2015/11/20 01:01:48 UTC
mesos git commit: Fixed a few style issues in docs/configuration.md.
Repository: mesos
Updated Branches:
refs/heads/master 250416b91 -> 80b8a974c
Fixed a few style issues in docs/configuration.md.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/80b8a974
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/80b8a974
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/80b8a974
Branch: refs/heads/master
Commit: 80b8a974cd757fc2a6f1dee99f3b99adcda99b58
Parents: 250416b
Author: Jie Yu <yu...@gmail.com>
Authored: Thu Nov 19 16:01:39 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Nov 19 16:01:39 2015 -0800
----------------------------------------------------------------------
docs/configuration.md | 49 ++++++++++++++++++++++++++++++++++------------
1 file changed, 36 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/80b8a974/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index b3e09b3..126f4aa 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -5,16 +5,30 @@ layout: documentation
# Mesos Configuration
-The Mesos master and slave can take a variety of configuration options through command-line arguments, or environment variables. A list of the available options can be seen by running `mesos-master --help` or `mesos-slave --help`. Each option can be set in two ways:
+The Mesos master and slave can take a variety of configuration options
+through command-line arguments, or environment variables. A list of
+the available options can be seen by running `mesos-master --help` or
+`mesos-slave --help`. Each option can be set in two ways:
-* By passing it to the binary using `--option_name=value`, either specifying the value directly, or specifying a file in which the value resides (`--option_name=file://path/to/file`). The path can be absolute or relative to the current working directory.
-* By setting the environment variable `MESOS_OPTION_NAME` (the option name with a `MESOS_` prefix added to it).
+* By passing it to the binary using `--option_name=value`, either
+specifying the value directly, or specifying a file in which the value
+resides (`--option_name=file://path/to/file`). The path can be
+absolute or relative to the current working directory.
-Configuration values are searched for first in the environment, then on the command-line.
+* By setting the environment variable `MESOS_OPTION_NAME` (the option
+name with a `MESOS_` prefix added to it).
+
+Configuration values are searched for first in the environment, then
+on the command-line.
**Important Options**
-If you have special compilation requirements, please refer to `./configure --help` when configuring Mesos. Additionally, this documentation lists only a recent snapshot of the options in Mesos. A definitive source for which flags your version of Mesos supports can be found by running the binary with the flag `--help`, for example `mesos-master --help`.
+If you have special compilation requirements, please refer to
+`./configure --help` when configuring Mesos. Additionally, this
+documentation lists only a recent snapshot of the options in Mesos. A
+definitive source for which flags your version of Mesos supports can
+be found by running the binary with the flag `--help`, for example
+`mesos-master --help`.
## Master and Slave Options
@@ -1263,7 +1277,9 @@ file:///path/to/file (where file contains one of the above)</code></pre>
'cgroups/cpu,cgroups/mem', or network/port_mapping
(configure with flag: --with-network-isolator to enable),
or 'external', or load an alternate isolator module using
- the <code>--modules</code> flag. Note that this flag is only relevant for the Mesos Containerizer. (default: posix/cpu,posix/mem)
+ the <code>--modules</code> flag. Note that this flag is only
+ relevant for the Mesos Containerizer.
+ (default: posix/cpu,posix/mem)
</td>
</tr>
<tr>
@@ -1568,9 +1584,16 @@ file:///path/to/file (where file contains one of the above)</code></pre>
--fetcher_cache_dir=VALUE
</td>
<td>
- Parent directory for fetcher cache directories (one subdirectory per slave). By default this directory is held inside the work directory, so everything can be deleted or archived in one swoop, in particular during testing. However, a typical production scenario is to use a separate cache volume. First, it is not meant to be backed up. Second, you want to avoid that sandbox directories and the cache directory can interfere with each other in unpredictable ways by occupying shared space. So it is recommended to set the cache directory explicitly.
- (default: /tmp/mesos/fetch)
- </td>
+ Parent directory for fetcher cache directories (one subdirectory
+ per slave). By default this directory is held inside the work
+ directory, so everything can be deleted or archived in one
+ swoop, in particular during testing. However, a typical
+ production scenario is to use a separate cache volume. First, it
+ is not meant to be backed up. Second, you want to avoid that
+ sandbox directories and the cache directory can interfere with
+ each other in unpredictable ways by occupying shared space. So
+ it is recommended to set the cache directory explicitly.
+ (default: /tmp/mesos/fetch) </td>
</tr>
<tr>
<td>
@@ -1642,10 +1665,10 @@ file:///path/to/file (where file contains one of the above)</code></pre>
</td>
<td>
Whether to assign an individual flow for each container for the
- egress traffic. fq_codel qdisc is used to isolate egress traffic for
- containers. This flag is used for the 'network/port_mapping' isolator.
- Note, fq_codel qdisc is installed at root and is not removed after mesos
- slave exits.
+ egress traffic. fq_codel qdisc is used to isolate egress traffic
+ for containers. This flag is used for the 'network/port_mapping'
+ isolator. Note, fq_codel qdisc is installed at root and is not
+ removed after mesos slave exits. (default: false)
</td>
</tr>
<tr>