summaryrefslogtreecommitdiff
path: root/qpid/cpp/etc
Commit message (Collapse)AuthorAgeFilesLines
* QPID-7207: remove cpp and python subdirs from svn trunk, they have migrated ↵Robert Gemmell2016-07-0511-915/+0
| | | | | | to their own git repositories git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1751566 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6256: Improved handling of protocol version incompatibilitiesGordon Sim2015-06-171-0/+3
| | | | | | | | | | | | | | | | * 0-10 path no longer hans on open when connecting to a broker not supporting that version * the 'protocol' connection option now supports specifying multiple protocols to try in order (as a coma separated list) * the protocol defaults, i.e. the value assumed if the 'protocol' connection option is not specified, can now be set via the client config file (e.g. protocol-defaults=amqp1.0,amqp0-10) or an environment variable (e.g QPID_PROTOCOL_DEFAULTS=amqp1.0,amqp0-10) * if neither the connection option nor the defaults are specified all valid versions will be tried (currently amqp0-10, then amqp1.0 but this may change in a future version) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1686078 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6549: `service qpidd status` returns 1 - hidden error is ↵Alan Conway2015-05-201-22/+26
| | | | | | | | | | | | "ConnectionError: connection-forced: Connection must be encrypted.(320)" The qpidd init script uses qpid-ha to probe the state of the broker. In the bug reported security configuration on the broker was preventing qpid-ha from connecting. The qpid-ha checks are only necessary when HA is configured, so this commit disables those checks if it is not configured. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1680552 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6548: SYSV init scripts do not work properly wiht SSL-only broker.Alan Conway2015-05-201-7/+4
| | | | | | | | | | | | Previously the broker was writing a PID file with the port number as a suffix. This was confusing the tools when using SSL and no explicit port, as the actual listening port is 5671 but qpidd -c was looking for 5672. This commit introduces a simple --pidfile option which writes the pid exactly where you tell it with no frills. The original port-pidfile setup is over complex and not really necessary, it can be deprecated at some future time. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1680550 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6035: HA clearly distinguish qpid-ha commands intended for cluster manager.Alan Conway2014-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a --cluster-manager flag to qpid-ha tool. Without this flag - the 'promote' command is not listed in the tool help. - using the promote command raises an error saying that it is only for cluster manager use and mentioning the --cluster-manager flag. With the flag: promote functions as before. The qpid-ha help text for promote is also more clear now that it is for cluster manager only. Originally the idea was to split qpid-ha into two tools but I have kept one tool with the flag and warning messages because it: - avoids packaging changes that might trip things up. - helps people who are already using qpid-ha promote: their scripts will break but the error message explains how to fix it. I think the special role of promote is sufficiently clear now even if it is part of the same tool. This commit also updates the following to take account of the new flag: - rgmanager qpidd-primary script. - qpidd tests. - qpid book HA chapter. NOTE: THIS WILL BREAK TEST HARNESSES that do promotion outside of rgmanager. You'll need to add the --cluster-manager flag in the relevant places. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619877 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5942: qpid HA cluster may end-up in joining state after HA primary is ↵Alan Conway2014-07-312-42/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | killed There are two issues here, both related to the fact that rgmanager sees qpidd and qpidd-primary as two separate services. 1. The service start/stop scripts can be called concurrently. This can lead to running a qpidd process who's pid is not in the pidfile. rgmanager cannot detect or kill this qpidd and cannot start another qpidd because of the lock on the qpidd data directory. 2. rgmanager sees a primary failure as two failures: qpidd and qpidd-primary, and will then try to stop and start both services. The order of these actions is not defined and can lead to rgmanager killing a service it has just started. This patch makes two major changes to the init scripts: 1. Uses flock to lock the sensitive stop/start part of the scripts to ensure they are not executed concurrently. 2. On "stop" the scripts check if a running qpidd is primary or not. "qpidd stop" is a no-op if the running broker is primary, "qpidd-primary stop" is a no op if it is not. This ensures that a broker will be stopped by the same stream of service actions that started it. Minor changes in this patch: - better logging of broker start-up and shut-down sequence. - qpid-ha heartbeat use half of timeout option. - add missing timeouts in qpid-ha. Notes: This changes the behavior of 'clusvcadm -d <qpidd-service>' on the primary node. Previously this would have stopped the qpidd service on that node, killed the qpidd process and relocated the primary service. Now this will stop the qpidd service (as far as rgmanager is concerned) but will not kill qpidd or relocate the primary service. When the primary is relocated the qpidd service wil not be able to re-start on that node until it is re-enabled with 'clusvcadm -e'. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614895 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5719: HA becomes unresponsive once any of the brokers are SIGSTOPedAlan Conway2014-07-181-2/+14
| | | | | | | | | Fixed typo in qpidd script that was causing this not to work if a backup was SIGSTOPed. Also fixed bug where data-dir setting in qpidd.conf was being ignored. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1611790 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5719: Fix unintentional dependency on qpid-ha for non-HA installations.Alan Conway2014-04-281-3/+8
| | | | | | qpidd init script should not use qpid-ha if it is not installed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590777 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5719: HA becomes unresponsive once any of the brokers are SIGSTOPedAlan Conway2014-04-242-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | - Added timeout to qpid-ha. - qpidd init script pings broker to verify it is not hung. - updated documentation in qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml. The new results for the cases mentioned in the bug: a] stopped ALL brokers: rgmanager restarts the entire cluster but data is lost. Equivalent to killing all the brokers at once. This does not affect quorum because only qpidd services are affected, not other services managed by cman. b] stopped the primary: rgmanager restarts the primary after a timeout and promotes one of the backups. c] stopped a backup: rgmanager restarts the backups after a timeout. Clients that are actively sending messages may see a delay while backup is restarted. Note you need to set link-heartbeat-interval in qpidd.conf. The default is very high (120 seconds), it should be set lower to see recovery from sigstop in a reasonable time. See the updated documentation in qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589807 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5711: HA cannot promote primary if SASL security is enabled.Alan Conway2014-04-233-23/+29
| | | | | | | | | | | | Updated the qpid-ha tool and qpidd init scripts to handle SASL authentication. The qpid-ha script as as called by the qpidd-primary init script now reads authentication settings from the qpidd.conf file and uses them to connect to the local broker. - qpidd-primary script respects prefix: use installed location for qpidd script, not "service" call - qpid-ha added --config option qpid-ha options to use qpidd.conf for local broker connection. - qpid-ha --all use user/pass for each broker. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589391 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Add missing apache copyright licence text.Alan Conway2013-12-161-0/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1551304 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5336: Don't hardcode location of bash in shell scriptsAndrew Stitcher2013-11-142-2/+2
| | | | | | | As bash isn't specified by POSIX its location is variable. Specifically under BSDs it isn't found in /bin/bash. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1541763 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5260: Significant tidy up of cmake buildAndrew Stitcher2013-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | * Move to cmake 2.6 as minimum required version (2.4 is extremely long in the tooth now) * Add control over building individual language bindings * Make settings you don't usually want to change advanced so they are hidden by default * Changed to a uniform naming scheme for options: ** Options controlling what to build are all BUILD_ ** Options controlling features of he build are ENABLE_ ** Options controlling internal aspects of the qpid runtime are QPID_ * Respect the BUILD_TESTING option so that we won't build the tests unless it is set (it is by default) * If we don't find the boost_unit_test_framework then don't fail, just don't build the unit tests (this is motivated by one of the Apache Jenkins ubuntu builders which has this set up) * Tidied up some of the detection of external dependencies to make it more idiomatic cmake (but there is more to do here) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1536329 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5035: Revert change 1510657, which incorrectly altered the config ↵Justin Ross2013-10-151-1/+2
| | | | | | precedence git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1532542 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5035: Respect data-dir setting from config fileJustin Ross2013-08-051-2/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1510657 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4640: QPID-3633: Remove autotools build from qpid C++ source treeAndrew Stitcher2013-07-252-89/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1507112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4955: Don't install SYSV style service control files on WindowsAndrew Stitcher2013-06-271-2/+1
| | | | | | (fixes Windows breakage from previous commit) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1497204 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4955: CMake install puts config files in the wrong placeAndrew Stitcher2013-06-261-2/+2
| | | | | | | | - Also removed ability to specify daemon and client config file locations individually as that isn't straightforwardly possible with the CMake install capability. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1497148 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4733: Fix windows problem introduced by installation of init scriptsAlan Conway2013-04-111-12/+17
| | | | | | | Do init script installation conditional on UNIX only. SYSCONF_INSTALL_DIR is not set on windows. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1467054 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4733: Fix cmake installation of init scriptsAlan Conway2013-04-104-13/+22
| | | | | | | | | - Install both qpidd and qpidd-primary init scripts. - Fix path substitution to use absolute paths. - Fix substitution to work on cmake and automake. - Set executable permissions for init scripts. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1466645 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4698: Missed two macros in qpidd-primary.inDarryl L. Pierce2013-04-092-4/+5
| | | | | | Fixed them to properly set the paths. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1466169 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4698: Fixed the install location for files under CMake.Darryl L. Pierce2013-04-082-3/+13
| | | | | | | | | Installs the SASL2 qpidd.conf file to /etc/qpid/sasl2/qpidd.conf Installs qpidd-primary to /etc/rc.d/init.d/qpidd-primary Installs the qmf-gen Python script to /usr/bin Installs the managementgen sitepackage to where sitelibs belong git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1465643 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4684: Remove obsolete options from example qpidd.conf file.Alan Conway2013-04-011-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1463145 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4600: New HA regularly shutting down active nodeAlan Conway2013-02-251-1/+1
| | | | | | | qpid-primary script was incorrect and failing on status calls, causing the broker to be restarted by rgmanager. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1449870 13f79535-47bb-0310-9956-ffa450edef68
* Revert "Bug 891689 - New HA regularly shutting down active node"Alan Conway2013-02-251-1/+1
| | | | | | | This reverts commit r1449832, the commit comment did not include a QPID JIRA number. A corrected version of the commit follows... git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1449869 13f79535-47bb-0310-9956-ffa450edef68
* Bug 891689 - New HA regularly shutting down active nodeAlan Conway2013-02-251-1/+1
| | | | | | | qpid-primary script was incorrect and failing on status calls, causing the broker to be restarted by rgmanager. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1449832 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4487: Remove systemd support and qpidd.service.Darryl L. Pierce2012-12-033-21/+1
| | | | | | | The configuration files will instead be provided by the various distrubitons as needed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1416607 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA only try to install qpidd.service on UNIX.Stephen D. Huston2012-11-281-3/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1414918 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4388: Fixed accidental deletion of qpidd.service file by autotools.Darryl L. Pierce2012-11-281-1/+1
| | | | | | | When moving the file from being processed to just included, the delete code was missed. Removed the file from the list of cleaned targets. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1414818 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Made the Systemd install directory macro consistent with others.Darryl L. Pierce2012-11-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1414666 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4388: Systemd support not being installed with CmakeDarryl L. Pierce2012-11-273-4/+7
| | | | | | | | | | Previously systemd support was only in the automake system, and the qpidd.service file was processed via sed. But, since there are no substitutions needed in the file, it's now renamed to qpidd.service. And both Makefile.am and CMakeLists.txt will simply install it to /usr/lib/systemd/system. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1414392 13f79535-47bb-0310-9956-ffa450edef68
* Changed systemd support to requiring Networking start first.Darryl L. Pierce2012-11-121-1/+1
| | | | | | | Before the qpidd service was started in parallel to networking. Now it's started after networking is started. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1408346 13f79535-47bb-0310-9956-ffa450edef68
* JIRA 4351 : Provides systemd support to qpidd.Darryl L. Pierce2012-10-112-3/+18
| | | | | | | Systemd is a replacement for SysVInit scripts for starting up daemons on Linux systems. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1397235 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4244 : expand broker mech list in sasl config file.Michael Goulish2012-08-241-14/+16
| | | | | | | | | | in The file /etc/sasl2/qpidd.conf, expand the list to: ANONYMOUS DIGEST-MD5 EXTERNAL PLAIN and improve the comments. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1376958 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Skip HA tests if required python tools are not available.Alan Conway2012-05-071-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1335218 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3603: Minor improvements to HA tests, documentation and examples.Alan Conway2012-04-162-18/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1326755 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove use of nobase_doc_DATA, doesn't work on rhel5.Alan Conway2012-04-121-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1325472 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3603: Fixed broken make rules for cluster.conf-example.xmlAlan Conway2012-04-101-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1311986 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3603: Update HA documentation: example of virtual IP addressesAlan Conway2012-03-281-8/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1306454 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3603: Substitute installation directories in qpidd init scripts.Alan Conway2012-03-274-17/+32
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1306007 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Fix typo in cluster.conf-example.xmlAlan Conway2012-03-271-3/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1305928 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3603: Minor updates to doc and example cluster configuration.Alan Conway2012-03-271-11/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1305890 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3603: Install scripts and configuration for qpid HA rgmanager integration.Alan Conway2012-03-272-22/+22
| | | | | | | qpid/bin/install-cpp-python: installs c++ and python builds. qpid/cpp/etc/Makefile.am: installs init.d scripts. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1305851 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3603: rgmanager integration for new HA clusterAlan Conway2012-03-083-1/+180
| | | | | | | | - service start script qpid-primary, called by rgmanager to promote a broker. - example cluster.conf - minor changes to qpid-ha git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1298602 13f79535-47bb-0310-9956-ffa450edef68
* I am removing DIGEST-MD5 from the mech list, because we cannot supplyMichael Goulish2011-11-031-16/+50
| | | | | | | | | | | | a username+passwd in the sasldb file without introducing a security hole to production systems. So now the only mech is ANONYMOUS -- and lots of changes to the comments to make it clear how to enable MD5 and how to add username+passwd for it. Also, one of the broker options that was mentioned in the old text was archaic -- updated that. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1197178 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3464: Build Improvements (CMake) [from Jan-Marek Glogowski]Andrew Stitcher2011-11-031-1/+13
| | | | | | | - Improved CMake build significantly bringing it closer in parity to autotools build git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1197146 13f79535-47bb-0310-9956-ffa450edef68
* JIRA 3337Michael Goulish2011-07-063-26/+4
| | | | | | | | | | | no more defaulting to guest/guest username/password qpidd.sasldb is no longer created -- users who want usernames and passwords in there must create it. but a local qpidd.sasldb is (before this change) being created for 'make check' testing. The etc/sasl2/qpidd.conf file now has an explicit mech list -- so we will no longer default to the system-list. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1143536 13f79535-47bb-0310-9956-ffa450edef68
* add ASF licence to various files in the cpp treeRobert Gemmell2010-10-312-0/+38
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1029521 13f79535-47bb-0310-9956-ffa450edef68
* Add ASF licence to the git ignore filesRobert Gemmell2010-10-281-0/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1028476 13f79535-47bb-0310-9956-ffa450edef68
* Added some missing licenses; added FedOps.h to distribution listGordon Sim2010-10-271-0/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1027879 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status