Repository: mesos Updated Branches: refs/heads/master ad4959b52 -> 46ce7f68b
Fixed user cgroup failing test on centos 7. Review: https://reviews.apache.org/r/37863 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/46ce7f68 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/46ce7f68 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/46ce7f68 Branch: refs/heads/master Commit: 46ce7f68b10afa7cdb3d044ba96ab0431bf7538d Parents: ad4959b Author: Timothy Chen <[email protected]> Authored: Thu Aug 27 23:49:19 2015 +0000 Committer: Timothy Chen <[email protected]> Committed: Thu Aug 27 17:07:28 2015 -0700 ---------------------------------------------------------------------- src/tests/containerizer/isolator_tests.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/46ce7f68/src/tests/containerizer/isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/isolator_tests.cpp b/src/tests/containerizer/isolator_tests.cpp index 2755d06..d34c82a 100644 --- a/src/tests/containerizer/isolator_tests.cpp +++ b/src/tests/containerizer/isolator_tests.cpp @@ -1264,7 +1264,17 @@ TYPED_TEST(UserCgroupIsolatorTest, ROOT_CGROUPS_UserCgroup) vector<string> cgroups = strings::tokenize(grepOut.get(), "\n"); ASSERT_FALSE(cgroups.empty()); - foreach (const string& cgroup, cgroups) { + foreach (string cgroup, cgroups) { + if (!os::exists(path::join(flags.cgroups_hierarchy, cgroup)) && + strings::startsWith(cgroup, "cpuacct,cpu")) { + // An existing bug in CentOS 7.x causes 'cpuacct,cpu' cgroup to + // be under 'cpu,cpuacct'. Actively detect this here to + // work around this problem. + vector<string> parts = strings::split(cgroup, "/"); + parts[0] = "cpu,cpuacct"; + cgroup = strings::join("/", parts); + } + // Check the user cannot manipulate the container's cgroup control // files. EXPECT_NE(0, os::system(
