diff options
| author | Alan Conway <aconway@apache.org> | 2012-12-19 22:19:52 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-12-19 22:19:52 +0000 |
| commit | dad6d3eaac2ddb87ae0071b868e59112b2d5325b (patch) | |
| tree | 13536510244ffc9914b2ff7618cf2a346580a051 /qpid/cpp/src/qpid/ha/Primary.h | |
| parent | f58ea784ad1930c6b8bbf1b9a9e32bf3575c4bed (diff) | |
| download | qpid-python-dad6d3eaac2ddb87ae0071b868e59112b2d5325b.tar.gz | |
QPID-4516: Sporadic failure in ha_tests test_failover_send_receive
Sporadic failures in ha_tests.py test_failover_send_receive. Two types of failure observed:
- core dumps in a debug build at a C++ assertion
- python test assertion like: AssertionError: Broker<137:cluster0-0.log qpidd-157 :35273> expected='ready', actual='catchup'
The following fixes were made to correct the problem:
- Missing break statement in switch.
- Remove unused function HaBroker::resetMembership
- Abort connection of timed-out backups so they can attempt to reconnect.
- New primary resets membership before allowing backups to connect.
- Remove incorrect demotion ready->catchup on timeout.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1424169 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/ha/Primary.h')
| -rw-r--r-- | qpid/cpp/src/qpid/ha/Primary.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.h b/qpid/cpp/src/qpid/ha/Primary.h index c713115176..08e92d5673 100644 --- a/qpid/cpp/src/qpid/ha/Primary.h +++ b/qpid/cpp/src/qpid/ha/Primary.h @@ -98,8 +98,8 @@ class Primary bool active; /** * Set of expected backups that must be ready before we declare ourselves - * active. These are backups that were known before the primary crashed. As - * new primary we expect them to re-connect. + * active. These are backups that were known and ready before the primary + * crashed. As new primary we expect them to re-connect. */ BackupSet expectedBackups; /** |