You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/10/08 02:01:07 UTC
[2/2] mesos git commit: Fixed a potential flaky linux filesystem
isolator test.
Fixed a potential flaky linux filesystem isolator test.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d16f53d5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d16f53d5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d16f53d5
Branch: refs/heads/master
Commit: d16f53d5a9e15d1d9533739a8c052bc546ec3262
Parents: ad13fb4
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Oct 7 18:38:43 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Oct 7 18:38:43 2016 -0700
----------------------------------------------------------------------
src/tests/containerizer/linux_filesystem_isolator_tests.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d16f53d5/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
index aa200c1..eb191a3 100644
--- a/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
+++ b/src/tests/containerizer/linux_filesystem_isolator_tests.cpp
@@ -1215,17 +1215,20 @@ TEST_F(LinuxFilesystemIsolatorMesosTest,
// above running task as an orphan.
ASSERT_SOME(os::rmdir(slave::paths::getMetaRootDir(flags.work_dir)));
+ Future<Nothing> _recover = FUTURE_DISPATCH(_, &Slave::_recover);
+
// Recreate the containerizer using the same helper as above.
containerizer.reset();
create = MesosContainerizer::create(flags, true, &fetcher);
+ ASSERT_SOME(create);
+
containerizer.reset(create.get());
slave = StartSlave(detector.get(), containerizer.get(), flags);
ASSERT_SOME(slave);
// Wait until slave recovery is complete.
- Future<Nothing> _recover = FUTURE_DISPATCH(_, &Slave::_recover);
AWAIT_READY(_recover);
// Wait until the orphan containers are cleaned up.