You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/11/25 23:41:59 UTC
git commit: Fixed the ContenderDetectorShutdownNetwork test flakiness.
Updated Branches:
refs/heads/master dc5bf0e52 -> f051c4535
Fixed the ContenderDetectorShutdownNetwork test flakiness.
From: Jiang Yan Xu <ya...@jxu.me>
Review: https://reviews.apache.org/r/15845
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f051c453
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f051c453
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f051c453
Branch: refs/heads/master
Commit: f051c453571060498ef2dbbf879224a569f0882c
Parents: dc5bf0e
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Nov 25 14:35:19 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Mon Nov 25 14:35:19 2013 -0800
----------------------------------------------------------------------
src/tests/master_contender_detector_tests.cpp | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f051c453/src/tests/master_contender_detector_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp
index 5e42374..8947732 100644
--- a/src/tests/master_contender_detector_tests.cpp
+++ b/src/tests/master_contender_detector_tests.cpp
@@ -298,10 +298,14 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, ContenderDetectorShutdownNetwork)
// Shut down ZooKeeper and expect things to fail after the timeout.
server->shutdownNetwork();
- Clock::advance(std::max(
- MASTER_DETECTOR_ZK_SESSION_TIMEOUT,
- MASTER_CONTENDER_ZK_SESSION_TIMEOUT));
- Clock::settle();
+ // We may need to advance multiple times because we could have
+ // advanced the clock before the timer in Group starts.
+ while (lostCandidacy.isPending()) {
+ Clock::advance(std::max(
+ MASTER_DETECTOR_ZK_SESSION_TIMEOUT,
+ MASTER_CONTENDER_ZK_SESSION_TIMEOUT));
+ Clock::settle();
+ }
AWAIT_EXPECT_FAILED(lostCandidacy);
AWAIT_READY(leader);
@@ -320,6 +324,8 @@ TEST_F(ZooKeeperMasterContenderDetectorTest, ContenderDetectorShutdownNetwork)
server->startNetwork();
AWAIT_READY(contended);
AWAIT_READY(leader);
+
+ Clock::resume();
}