Repository: mesos Updated Branches: refs/heads/master 0812300e4 -> 1c6d9e5e6
Fixed flaky ReconciliationTest.ReconcileStatusUpdateTaskState. To simulate a master failover we need to use `replicated_log` as the registry otherwise the master loses persisted info about the agents. Review: https://reviews.apache.org/r/66769 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1c6d9e5e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1c6d9e5e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1c6d9e5e Branch: refs/heads/master Commit: 1c6d9e5e6d7439444c77d6c91b18642f69557dfe Parents: 0812300 Author: Jiang Yan Xu <xuj...@apple.com> Authored: Mon Apr 23 14:59:44 2018 -0700 Committer: Jiang Yan Xu <xuj...@apple.com> Committed: Mon Apr 30 21:33:26 2018 -0700 ---------------------------------------------------------------------- src/tests/reconciliation_tests.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/1c6d9e5e/src/tests/reconciliation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/reconciliation_tests.cpp b/src/tests/reconciliation_tests.cpp index b06244b..cdff370 100644 --- a/src/tests/reconciliation_tests.cpp +++ b/src/tests/reconciliation_tests.cpp @@ -1018,6 +1018,8 @@ TEST_F(ReconciliationTest, ReconcileStatusUpdateTaskState) { // Start a master. master::Flags masterFlags = CreateMasterFlags(); + masterFlags.registry = "replicated_log"; + Try<Owned<cluster::Master>> master = StartMaster(masterFlags); ASSERT_SOME(master); @@ -1087,7 +1089,7 @@ TEST_F(ReconciliationTest, ReconcileStatusUpdateTaskState) // Simulate master failover by restarting the master. master->reset(); - master = StartMaster(); + master = StartMaster(masterFlags); ASSERT_SOME(master); Clock::resume();
