Repository: mesos Updated Branches: refs/heads/master 7c691ebce -> 081c3114f
Documented the `--xfs-kill-containers` flag. Added a description of the `--xfs-kill-containers` flag to the `disk/xfs` isolator page and listed it in the upgrade documentation. Review: https://reviews.apache.org/r/66975/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/081c3114 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/081c3114 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/081c3114 Branch: refs/heads/master Commit: 081c3114fefa18c6acd1e884e6d6583232e30d5c Parents: 7c691eb Author: Harold Dost <[email protected]> Authored: Mon May 7 08:39:29 2018 -0700 Committer: James Peach <[email protected]> Committed: Mon May 7 08:54:45 2018 -0700 ---------------------------------------------------------------------- docs/isolators/disk-xfs.md | 13 +++++++++++-- docs/upgrades.md | 8 ++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/081c3114/docs/isolators/disk-xfs.md ---------------------------------------------------------------------- diff --git a/docs/isolators/disk-xfs.md b/docs/isolators/disk-xfs.md index e56f647..96bb39e 100644 --- a/docs/isolators/disk-xfs.md +++ b/docs/isolators/disk-xfs.md @@ -39,5 +39,14 @@ to display the `fsxattr.projid` field. For example: $ xfs_io -r -c stat /mnt/mesos/ -Note that the Posix Disk isolator `--container_disk_watch_interval` -does not apply to the XFS Disk isolator. +## Killing containers + +The XFS Disk isolator flag `--xfs_kill_containers` will create container +quotas that have a gap between the soft and hard limits. The soft limit is +equal to the limit requested for the `disk` resource and the hard limit +is 10MB higher. If a container violates the soft limit then it will be +killed. The isolator polls for soft limit violations at the interval +specified by the `--container_disk_watch_interval` flag. + +Note that the `--container_disk_watch_interval` flag only applies to +the XFS Disk isolator when `--xfs_kill_containers` is set to true. http://git-wip-us.apache.org/repos/asf/mesos/blob/081c3114/docs/upgrades.md ---------------------------------------------------------------------- diff --git a/docs/upgrades.md b/docs/upgrades.md index 512d5d9..baf4a0f 100644 --- a/docs/upgrades.md +++ b/docs/upgrades.md @@ -57,6 +57,9 @@ We categorize the changes as follows: <ul style="padding-left:10px;"> <li>A <a href="#1-6-x-fetcher-stall-timeout">fetcher_stall_timeout</a></li> </ul> + <ul style="padding-left:10px;"> + <li>A <a href="#1-6-x-xfs-kill-containers">xfs_kill_containers</a></li> + </ul> </td> <td style="word-wrap: break-word; overflow-wrap: break-word;"><!--Framework API--> @@ -412,6 +415,11 @@ We categorize the changes as follows: * The disk profile adaptor module has been changed to support CSI v0.2, and its header file has been renamed to be consistent with other modules. See `disk_profile_adaptor.hpp` for interface changes. +<a name="1-6-x-xfs-kill-containers"></a> + +* A new agent flag `--xfs_kill_containers` has been added. By setting this flag, the [`disk/xfs`](isolators/disk-xfs.md) isolator + will now kill containers that exceed the disk limit. + ## Upgrading from 1.4.x to 1.5.x ## <a name="1-5-x-task-starting"></a>
