diff options
| author | Alan Conway <aconway@apache.org> | 2012-10-05 18:21:45 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-10-05 18:21:45 +0000 |
| commit | f6bf1d808361f0fcfa40c2971ea0a68d26efffc4 (patch) | |
| tree | 56eef19d19c1b1b810a2deefbe995a93b968fdb8 /qpid/cpp/include | |
| parent | 8d32f064dd2a6998e68345a8fc97a6a218aef1fd (diff) | |
| download | qpid-python-f6bf1d808361f0fcfa40c2971ea0a68d26efffc4.tar.gz | |
QPID-4360: Non-ready HA broker can be incorrectly promoted to primary
A joining broker now attempts to contact all known members of the cluster and
check their status. If any brokers are in a state other than "joining" the
broker will refuse to promote. This will allow rgmanager to continue to try
addresses till it finds a ready brokers.
Note this reqiures ha-brokers-url to be a list of all known brokers, not a
virtual IP. ha-public-url can still be a VIP.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1394706 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/include')
| -rw-r--r-- | qpid/cpp/include/qpid/client/ConnectionSettings.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/qpid/cpp/include/qpid/client/ConnectionSettings.h b/qpid/cpp/include/qpid/client/ConnectionSettings.h index 2b6b86f891..a0c209badf 100644 --- a/qpid/cpp/include/qpid/client/ConnectionSettings.h +++ b/qpid/cpp/include/qpid/client/ConnectionSettings.h @@ -23,6 +23,7 @@ */ #include "qpid/client/ClientImportExport.h" +#include "qpid/framing/FieldTable.h" #include "qpid/sys/IntegerTypes.h" #include <string> @@ -127,6 +128,11 @@ struct QPID_CLIENT_CLASS_EXTERN ConnectionSettings { * settings. Used only when a client connects to the broker. */ std::string sslCertName; + + /** + * Passed as client-propreties on opening the connecction. + */ + framing::FieldTable clientProperties; }; }} // namespace qpid::client |