Repository: mesos Updated Branches: refs/heads/master 88cfe2fe2 -> 082d10e5f
Used 'cgroups::enabled' to check for the availability of the freezer. Review: https://reviews.apache.org/r/39841 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/082d10e5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/082d10e5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/082d10e5 Branch: refs/heads/master Commit: 082d10e5feefd72ed300e593019ec56e18418142 Parents: 88cfe2f Author: Artem Harutyunyan <[email protected]> Authored: Tue Nov 3 16:09:09 2015 -0800 Committer: Jie Yu <[email protected]> Committed: Tue Nov 3 16:43:21 2015 -0800 ---------------------------------------------------------------------- src/slave/containerizer/linux_launcher.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/082d10e5/src/slave/containerizer/linux_launcher.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/linux_launcher.cpp b/src/slave/containerizer/linux_launcher.cpp index c0adb34..ea76894 100644 --- a/src/slave/containerizer/linux_launcher.cpp +++ b/src/slave/containerizer/linux_launcher.cpp @@ -182,12 +182,12 @@ bool LinuxLauncher::available() { // Make sure: // - we run as root - // - cgroups are enabled - // - "freezer" subsytem is available. + // - "freezer" subsytem is enabled. + Try<bool> freezer = cgroups::enabled("freezer"); return ::geteuid() == 0 && - cgroups::enabled() && - cgroups::hierarchy("freezer").isSome(); + freezer.isSome() && + freezer.get(); }
