Renamed 'xfs/disk' isolator to 'disk/xfs'. Review: https://reviews.apache.org/r/47894
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/66b8712e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/66b8712e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/66b8712e Branch: refs/heads/master Commit: 66b8712ece37d6f56fcaaba5737267a299d3749d Parents: e5c5862 Author: Jiang Yan Xu <y...@jxu.me> Authored: Tue May 17 00:53:50 2016 -0700 Committer: Jiang Yan Xu <y...@jxu.me> Committed: Fri May 27 16:27:07 2016 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 +- docs/mesos-containerizer.md | 4 ++-- src/slave/containerizer/mesos/containerizer.cpp | 2 +- src/tests/containerizer/xfs_quota_tests.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/66b8712e/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index d9b155d..c778aee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,7 +38,7 @@ This release contains the following new features: `mesos.scheduler`. `mesos.native` still exists, combining both modules for backwards compatibility with existing code. - * [MESOS-4828] - **Experimental** support for a new `xfs/disk' isolator + * [MESOS-4828] - **Experimental** support for a new `disk/xfs' isolator has been added to isolate disk resources more efficiently. Please refer to docs/mesos-containerizer.md for more details. http://git-wip-us.apache.org/repos/asf/mesos/blob/66b8712e/docs/mesos-containerizer.md ---------------------------------------------------------------------- diff --git a/docs/mesos-containerizer.md b/docs/mesos-containerizer.md index 22dffe0..cef520d 100644 --- a/docs/mesos-containerizer.md +++ b/docs/mesos-containerizer.md @@ -97,8 +97,8 @@ The XFS disk isolator is functionally similar to Posix Disk isolator but avoids the cost of repeatedly running the `du`. Though they will not interfere with each other, it is not recommended to use them together. -To enable the XFS Disk isolator, append `xfs/disk` to the -`--isolation` flag when starting the agent. +To enable the XFS Disk isolator, append `disk/xfs` to the `--isolation` +flag when starting the agent. The XFS Disk isolator requires the sandbox directory to be located on an XFS filesystem that is mounted with the `pquota` option. There http://git-wip-us.apache.org/repos/asf/mesos/blob/66b8712e/src/slave/containerizer/mesos/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp index e50f721..edc9118 100644 --- a/src/slave/containerizer/mesos/containerizer.cpp +++ b/src/slave/containerizer/mesos/containerizer.cpp @@ -239,7 +239,7 @@ Try<MesosContainerizer*> MesosContainerizer::create( {"posix/mem", &PosixMemIsolatorProcess::create}, {"posix/disk", &PosixDiskIsolatorProcess::create}, #if ENABLE_XFS_DISK_ISOLATOR - {"xfs/disk", &XfsDiskIsolatorProcess::create}, + {"disk/xfs", &XfsDiskIsolatorProcess::create}, #endif #ifdef __linux__ {"cgroups/cpu", &CgroupsCpushareIsolatorProcess::create}, http://git-wip-us.apache.org/repos/asf/mesos/blob/66b8712e/src/tests/containerizer/xfs_quota_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/xfs_quota_tests.cpp b/src/tests/containerizer/xfs_quota_tests.cpp index ce16006..091d768 100644 --- a/src/tests/containerizer/xfs_quota_tests.cpp +++ b/src/tests/containerizer/xfs_quota_tests.cpp @@ -162,7 +162,7 @@ public: // We only need an XFS-specific directory for the work directory. We // don't mind that other flags refer to a different temp directory. flags.work_dir = mountPoint.get(); - flags.isolation = "xfs/disk"; + flags.isolation = "disk/xfs"; return flags; }
