Repository: mesos Updated Branches: refs/heads/master cf7e9261c -> 31adac43c
Made filesystem/posix the default filesystem isolator. Review: https://reviews.apache.org/r/38472 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/31adac43 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/31adac43 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/31adac43 Branch: refs/heads/master Commit: 31adac43c313d692cd570f805386353dc493b8de Parents: 5f4e1fa Author: Jie Yu <[email protected]> Authored: Thu Sep 17 15:10:35 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Thu Sep 17 15:19:15 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/mesos/containerizer.cpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/31adac43/src/slave/containerizer/mesos/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp index e8a89bf..b4a77e7 100644 --- a/src/slave/containerizer/mesos/containerizer.cpp +++ b/src/slave/containerizer/mesos/containerizer.cpp @@ -129,29 +129,11 @@ Try<MesosContainerizer*> MesosContainerizer::create( // One and only one filesystem isolator is required. The filesystem // isolator is responsible for preparing the filesystems for // containers (e.g., prepare filesystem roots, volumes, etc.). If - // the user does not specify a filesystem isolator, the default - // 'filesystem/linux' isolator will be used if the slave runs on - // Linux and has root permission. Othersise, 'filesystem/posix' will - // be used as the default. + // the user does not specify one, 'filesystem/posix' will be used. // // TODO(jieyu): Check that only one filesystem isolator is used. if (!strings::contains(isolation, "filesystem/")) { -#ifdef __linux__ - Result<string> user = os::user(); - if (!user.isSome()) { - return Error( - "Failed to get the current user: " + - (user.isError() ? user.error() : "Not found")); - } - - if (user.get() == "root") { - isolation += ",filesystem/linux"; - } else { - isolation += ",filesystem/posix"; - } -#else isolation += ",filesystem/posix"; -#endif } // Modify the flags to include any changes to isolation.
