From ef9268528d3147173dfb0d2ef707ee3e4fc4f210 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 12 Mar 2010 20:11:31 +0000 Subject: New cluster member pushes store when joining an active cluster. Previously a broker with a clean store would not be able to join an active cluster because the shtudown-id did not match. This commit ensures that when a broker joins an active cluster, it always pushes its store regardless of status. Clean/dirty status is only compared when forming an initial cluster. This change required splitting initialization into two phases: PRE_INIT: occurs in the Cluster ctor during early-initialize. This phase determines whether or not to push the store. INIT: occurs after Cluster::initialize and does the remaining initialization chores. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@922412 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/InitialStatusMap.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'cpp/src/tests/InitialStatusMap.cpp') diff --git a/cpp/src/tests/InitialStatusMap.cpp b/cpp/src/tests/InitialStatusMap.cpp index 91c95ac517..ecbe2d4161 100644 --- a/cpp/src/tests/InitialStatusMap.cpp +++ b/cpp/src/tests/InitialStatusMap.cpp @@ -173,20 +173,6 @@ QPID_AUTO_TEST_CASE(testInteveningConfig) { BOOST_CHECK_EQUAL(map.getClusterId(), id); } -QPID_AUTO_TEST_CASE(testInitialSize) { - InitialStatusMap map(MemberId(0), 3); - map.configChange(list_of(0)(1)); - map.received(MemberId(0), newcomerStatus()); - map.received(MemberId(1), newcomerStatus()); - BOOST_CHECK(!map.isComplete()); - - map.configChange(list_of(0)(1)(2)); - map.received(MemberId(0), newcomerStatus()); - map.received(MemberId(1), newcomerStatus()); - map.received(MemberId(2), newcomerStatus()); - BOOST_CHECK(map.isComplete()); -} - QPID_AUTO_TEST_CASE(testAllCleanNoUpdate) { InitialStatusMap map(MemberId(0), 3); map.configChange(list_of(0)(1)(2)); @@ -244,8 +230,6 @@ QPID_AUTO_TEST_CASE(testEmptyAlone) { BOOST_CHECK(!map.isUpdateNeeded()); } -// FIXME aconway 2009-11-20: consistency tests for mixed stores, - QPID_AUTO_TEST_SUITE_END() }} // namespace qpid::tests -- cgit v1.2.1