Repository: mesos Updated Branches: refs/heads/master f9a5a800f -> ee9754127
Fixed a regression caused by multiple cgroups base hierarchy detection. Review: https://reviews.apache.org/r/32495 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ee975412 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ee975412 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ee975412 Branch: refs/heads/master Commit: ee9754127f6e530098a28c930bf589ad07c165af Parents: f9a5a80 Author: Jie Yu <[email protected]> Authored: Wed Mar 25 14:01:42 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Wed Mar 25 14:25:50 2015 -0700 ---------------------------------------------------------------------- src/tests/mesos.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ee975412/src/tests/mesos.cpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp index dc2a906..02cbb4b 100644 --- a/src/tests/mesos.cpp +++ b/src/tests/mesos.cpp @@ -544,19 +544,18 @@ void ContainerizerTest<slave::MesosContainerizer>::SetUp() ASSERT_FALSE(hierarchy.isError()); if (hierarchy.isSome()) { - const string& _baseHierarchy = strings::remove( - hierarchy.get(), - subsystem, - strings::SUFFIX); + Try<string> _baseHierarchy = os::dirname(hierarchy.get()); + ASSERT_SOME(_baseHierarchy) + << "Failed to get the base of hierarchy '" << hierarchy.get() << "'"; if (baseHierarchy.empty()) { - baseHierarchy = _baseHierarchy; + baseHierarchy = _baseHierarchy.get(); } else { - ASSERT_EQ(baseHierarchy, _baseHierarchy) + ASSERT_EQ(baseHierarchy, _baseHierarchy.get()) << "-------------------------------------------------------------\n" << "Multiple cgroups base hierarchies detected:\n" << " '" << baseHierarchy << "'\n" - << " '" << _baseHierarchy << "'\n" + << " '" << _baseHierarchy.get() << "'\n" << "Mesos does not support multiple cgroups base hierarchies.\n" << "Please unmount the corresponding (or all) subsystems.\n" << "-------------------------------------------------------------";
