DevinLeamy commented on code in PR #567:
URL: https://github.com/apache/mesos/pull/567#discussion_r1576512117
##########
src/tests/mesos.cpp:
##########
@@ -645,9 +664,16 @@ void
ContainerizerTest<slave::MesosContainerizer>::TearDownTestCase()
Result<string> user = os::user();
EXPECT_SOME(user);
- if (cgroups::enabled() && user.get() == "root") {
+ if (cgroupsV2() && *user == "root") {
+#ifdef ENABLE_CGROUPS_V2
+ // Clean up test cgroups.
+ if (cgroups2::exists(TEST_CGROUPS_ROOT)) {
+ ASSERT_SOME(cgroups2::destroy(TEST_CGROUPS_ROOT));
+ }
+#endif // ENABLE_CGROUPS_V2
+ } else if (cgroups::enabled() && *user == "root") {
// Clean up any testing hierarchies.
- Try<std::set<string>> hierarchies = cgroups::hierarchies();
+ Try<set<string>> hierarchies = cgroups::hierarchies();
Review Comment:
There are a few places where I removed `std::`. This is one instance. I
didn't feel it warranted a separate PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
