diff options
| author | Alan Conway <aconway@apache.org> | 2010-07-01 19:19:48 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-07-01 19:19:48 +0000 |
| commit | 61847068238af35543de06e54bc757dbfb3da776 (patch) | |
| tree | bd850b91b8af5acb7722ecad24beb943a8a5f186 /qpid/cpp/src | |
| parent | e570224156a2ee843026bea97a5128389a962d8b (diff) | |
| download | qpid-python-61847068238af35543de06e54bc757dbfb3da776.tar.gz | |
Fix spordic failure in cluster_test testConnectionKnownHosts.
Very occasional failure of the form:
cluster_test.cpp(547): error in "testConnectionKnownHosts": check kb0 == kb2 failed [42179 57640 != 44199 57640 ] ])
Fix is to avoid using possibly out-of-date initial-brokers data from the connection.
Only rely on updates received from the amq.failover exchange.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959751 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/client/FailoverListener.cpp | 12 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/ClusterFixture.cpp | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/client/FailoverListener.cpp b/qpid/cpp/src/qpid/client/FailoverListener.cpp index 3396f5598c..bf4fa91d49 100644 --- a/qpid/cpp/src/qpid/client/FailoverListener.cpp +++ b/qpid/cpp/src/qpid/client/FailoverListener.cpp @@ -33,8 +33,16 @@ FailoverListener::FailoverListener(Connection c) : connection(c), session(c.newSession(AMQ_FAILOVER+"."+framing::Uuid(true).str())), subscriptions(session) -{ - knownBrokers = c.getInitialBrokers(); +{ init(true); } + +FailoverListener::FailoverListener(Connection c, bool useInitial) : + connection(c), + session(c.newSession(AMQ_FAILOVER+"."+framing::Uuid(true).str())), + subscriptions(session) +{ init(useInitial); } + +void FailoverListener::init(bool useInitial) { + if (useInitial) knownBrokers = connection.getInitialBrokers(); if (session.exchangeQuery(arg::name=AMQ_FAILOVER).getNotFound()) { session.close(); return; diff --git a/qpid/cpp/src/tests/ClusterFixture.cpp b/qpid/cpp/src/tests/ClusterFixture.cpp index 04a5d35b06..6b62cb6fc7 100644 --- a/qpid/cpp/src/tests/ClusterFixture.cpp +++ b/qpid/cpp/src/tests/ClusterFixture.cpp @@ -142,7 +142,7 @@ void ClusterFixture::killWithSilencer(size_t n, client::Connection& c, int sig) *@param n if specified wait for the cluster size to be n, up to a timeout. */ std::set<int> knownBrokerPorts(qpid::client::Connection& c, int n) { - FailoverListener fl(c); + FailoverListener fl(c, false); std::vector<qpid::Url> urls = fl.getKnownBrokers(); if (n >= 0 && unsigned(n) != urls.size()) { // Retry up to 10 secs in .1 second intervals. |