This is an automated email from the ASF dual-hosted git repository. gilbert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 3628e0b1ab2681d70f99d379754b5c10d332d70e Author: Andrei Budnik <[email protected]> AuthorDate: Wed Oct 31 11:37:18 2018 -0700 Fixed flaky `CgroupsIsolatorTest.ROOT_CGROUPS_CreateRecursively` test. This patch postpones removing of `cgroups_root` until agent's recovery is complete. Otherwise, the agent might fail to start. Review: https://reviews.apache.org/r/69218/ --- src/tests/containerizer/cgroups_isolator_tests.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp b/src/tests/containerizer/cgroups_isolator_tests.cpp index eeaa850..957f72d 100644 --- a/src/tests/containerizer/cgroups_isolator_tests.cpp +++ b/src/tests/containerizer/cgroups_isolator_tests.cpp @@ -709,13 +709,17 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_CreateRecursively) Owned<MasterDetector> detector = master.get()->createDetector(); + Future<Nothing> __recover = FUTURE_DISPATCH(_, &Slave::__recover); + Try<Owned<cluster::Slave>> slave = StartSlave( detector.get(), containerizer.get(), flags); - ASSERT_SOME(slave); + // Wait until agent recovery is complete. + AWAIT_READY(__recover); + Result<string> hierarchy = cgroups::hierarchy("memory"); ASSERT_SOME(hierarchy);
