Added `cgroups/all` into the agent flag `--isolation`. Review: https://reviews.apache.org/r/67342/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bb670f16 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bb670f16 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bb670f16 Branch: refs/heads/master Commit: bb670f161e4c022988b6d00ea3bd11b10aa28236 Parents: f4729e3 Author: Qian Zhang <[email protected]> Authored: Mon Jun 18 23:23:37 2018 -0700 Committer: Gilbert Song <[email protected]> Committed: Mon Jun 18 23:36:50 2018 -0700 ---------------------------------------------------------------------- docs/configuration/agent.md | 9 ++++++--- src/slave/flags.cpp | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/bb670f16/docs/configuration/agent.md ---------------------------------------------------------------------- diff --git a/docs/configuration/agent.md b/docs/configuration/agent.md index 2ea22ba..68dad42 100644 --- a/docs/configuration/agent.md +++ b/docs/configuration/agent.md @@ -1032,9 +1032,12 @@ Isolation mechanisms to use, e.g., <code>posix/cpu,posix/mem</code> (or <code>cgroups/cpu,cgroups/mem</code>, or <code>network/port_mapping</code> (configure with flag: <code>--with-network-isolator</code> to enable), or <code>gpu/nvidia</code> for nvidia specific gpu isolation, or load an alternate -isolator module using the <code>--modules</code> flag. Note that this flag is only -relevant for the Mesos Containerizer. (default: windows/cpu,windows/mem on Windows; -posix/cpu,posix/mem on other platforms) +isolator module using the <code>--modules</code> flag. If <code>cgroups/all</code> +is specified, any other cgroups related isolation options (e.g., +<code>cgroups/cpu</code>) will be ignored, and all the local enabled cgroups +subsystems on the agent host will be automatically loaded by the cgroups isolator. +Note that this flag is only relevant for the Mesos Containerizer. (default: +windows/cpu,windows/mem on Windows; posix/cpu,posix/mem on other platforms) </td> </tr> http://git-wip-us.apache.org/repos/asf/mesos/blob/bb670f16/src/slave/flags.cpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp index 8e448d8..fe182a9 100644 --- a/src/slave/flags.cpp +++ b/src/slave/flags.cpp @@ -122,14 +122,17 @@ mesos::internal::slave::Flags::Flags() add(&Flags::isolation, "isolation", - "Isolation mechanisms to use, e.g., `posix/cpu,posix/mem` (or \n" + "Isolation mechanisms to use, e.g., `posix/cpu,posix/mem` (or\n" "`windows/cpu,windows/mem` if you are on Windows), or\n" "`cgroups/cpu,cgroups/mem`, or `network/port_mapping`\n" "(configure with flag: `--with-network-isolator` to enable),\n" "or `gpu/nvidia` for nvidia specific gpu isolation,\n" "or load an alternate isolator module using the `--modules`\n" - "flag. Note that this flag is only relevant for the Mesos\n" - "Containerizer.", + "flag. if `cgroups/all` is specified, any other cgroups related\n" + "isolation options (e.g., `cgroups/cpu`) will be ignored, and all\n" + "the local enabled cgroups subsystems on the agent host will be\n" + "automatically loaded by the cgroups isolator. Note that this flag\n" + "is only relevant for the Mesos Containerizer.", #ifndef __WINDOWS__ "posix/cpu,posix/mem" #else
