summaryrefslogtreecommitdiff
path: root/qpid/tools/src
Commit message (Collapse)AuthorAgeFilesLines
* QPID-5813: Lock in 0.30 release version numbers0.30Justin Ross2014-09-236-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1627099 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1619137 from trunk to address QPID-6024Robert Godfrey2014-08-251-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620361 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6025: Fix NPE bug on java QpidConfig portFraser Adams2014-08-224-6/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1619775 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5813: merge license and empty file changes from trunk rr1617774 and 1618218Robert Gemmell2014-08-151-0/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1618239 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5813, QPID-5913: various LICENCE and NOTICE file updatesRobert Gemmell2014-08-111-6/+0
| | | | | | | | | | | | | - Ensure the main java directory has LICENSE and NOTICE files for use in new source archive. - Update pointers within the files at the repo root. - Ensure the main java directory has LICENSE entry for crypto-js for inclusion in source release. - Ensure the management-http binary jar contains LICENSE file entry for crypto-js, clarify entry in brokers binary assembly tar.gz file. - Update reference file for dep change verification. merge from trunk r1617301 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1617303 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5610: update qpid-qmf2-tools assembly descriptor filename to match its ↵Robert Gemmell2014-08-112-1/+1
| | | | | | | | | output like all the others do merge from trunk r1617250 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1617251 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5610: add/update LICENSE,NOTICE,README.txt and dep check reference ↵Robert Gemmell2014-08-1115-126/+715
| | | | | | | | | files for the source tree/archive and the binary assembly releases merge from trunk r1617244 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1617249 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5610: add a profile override to the QMF build to disable the ↵Robert Gemmell2014-08-081-0/+26
| | | | | | apache-release source assembly creation, ported from trunk to 0.30 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1616852 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5980: port QMF2 javadoc fixups from trunk to the 0.30 branchRobert Gemmell2014-08-0838-63/+65
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1616849 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5942: qpid HA cluster may end-up in joining state after HA primary is ↵Alan Conway2014-07-311-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-5945]: qpid-config to pass integer arguments whenever possiblePavel Moravec2014-07-301-9/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614637 13f79535-47bb-0310-9956-ffa450edef68
* [QPID-5938]: qpid-stat: remove dead code relevant to active-active clusterPavel Moravec2014-07-301-61/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614577 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5932: Use default parameter values for method calls if necessary.Ken Giusti2014-07-281-2/+2
| | | | | | Original patch by Ernest Allen. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614109 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Added qpid-ha query --all flag.Alan Conway2014-07-181-24/+50
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1611747 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5850: Support for long session names (patch from Ernie Allen)Gordon Sim2014-07-161-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1611016 13f79535-47bb-0310-9956-ffa450edef68
* JIRA:QPID-5820 Added some defensive code to qmf-ui.js to protect against the ↵Fraser Adams2014-07-051-1/+2
| | | | | | case when null binding arguments get returned. Fixed bug in broker-core BindingImpl.java whereby the binding arguments were not being set on construction which caused getArguments to always return null git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1608025 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5610: update readme to detail usage of the copy-broker profileRobert Gemmell2014-07-041-4/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1607921 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5610: add a profile to optionally extract the broker release artifact ↵Robert Gemmell2014-07-042-1/+70
| | | | | | and copy the QMF2 broker plugin into the lib dir git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1607915 13f79535-47bb-0310-9956-ffa450edef68
* [QPID-5863]: qpid-config does not throws correct exception when binding ↵Pavel Moravec2014-07-011-1/+3
| | | | | | nonexisting exchange; fix from Zdenek Kraus git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1607061 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5820: [Java QMF2 Plugin] changes to plugin owing to the Java Broker ↵Keith Wall2014-07-014-9/+9
| | | | | | | | | | model updates made during 0.29 * Used model getters rather than named attributes wherever possible Work done by Andrew MacBean <macbean@apache.org> and me. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1607034 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5820: [Java QMF2 Plugin] changes to plugin owing to the Java Broker ↵Keith Wall2014-06-304-64/+111
| | | | | | | | | | | | | | | model updates made during 0.29 * VHNs (virtualhostnodes) may exist within a VH (virtualhost) * Use Port#availableProtocols rather than Port#protocols when trying to find the AMQP port * Like the CPP Broker, Binding#arguments will be null if the binding was created with none. Note that the QMF plugin still does not support virtualhosts created at runtime. They'll be ignored until the next restart. Work done by Andrew MacBean <macbean@apache.org> and me. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1606812 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5797: [qpid-tools]: inability to call some QMF methods ↵Pavel Moravec2014-06-021-5/+17
| | | | | | (queueMoveMessages / setLogLevel or so) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1599221 13f79535-47bb-0310-9956-ffa450edef68
* NO_JIRA: [linearstore] Update to ISSUES; whitespace fix from last checkinKim van der Riet2014-05-217-115/+130
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1596633 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5746, QPID-5610: fix compilation for QMF2 broker pluginRobert Gemmell2014-05-101-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1593707 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5754 : [Java Broker] close the qmf agent when the plugin is closedRobert Godfrey2014-05-081-0/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1593267 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5754 : [Java Broker] Make state change operations methods rather than ↵Robert Godfrey2014-05-082-30/+6
| | | | | | calls to setDesiredState git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1593264 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5610: copy the mavenised qmf2 java tools build tree to trunkRobert Gemmell2014-05-02234-0/+40383
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1592057 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5610: remove existing java qmf tools dir, to make way for the mavenised ↵Robert Gemmell2014-05-02237-41451/+0
| | | | | | version from the branch git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1592055 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: HA fix hanging ha_tests.test_failover_send_receive on RHEL5Alan Conway2014-05-011-1/+3
| | | | | | | | | | | | | The test was hanging because of a python construct not available in 2.4. It was causing an exception in a strange place because this bit of code was imported at runtime, and that was hanging the test. Fixed and did some cleanup to avoid such mysterious hangs in future: - Fixed qpidtoollibs/config.py to work with python 2.4. - Import qpid-ha script at import time rather than runtime. - Fix Popen.teardown logic to avoid hanging if a process can't be killed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1591794 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: HA qpid-ha usability: automatically use qpidd.conf if no --broker ↵Alan Conway2014-04-251-1/+13
| | | | | | option. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590118 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: HA minor cleanup of qpid-ha toolAlan Conway2014-04-241-22/+9
| | | | | | | | | | - Remove some dead code. - Removed "set" command - not ready for production. All settings in qpidd.conf. - Removed related tests in ha_tests - Improved help on promote command. - Made option group for common broker connection options. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589834 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5719: HA becomes unresponsive once any of the brokers are SIGSTOPedAlan Conway2014-04-241-22/+48
| | | | | | | | | | | | | | | | | | | | | | | | - 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-232-7/+52
| | | | | | | | | | | | 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
* QPID-5560: HA tests do not use AMQP 1.0Alan Conway2014-04-071-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HA tests were using only AMQP 0-10. Modified the tests to use AMQP 1.0 if available (still use 0-10 if 1.0 is not available) Fixed bugs uncovered both in the tests and in the AMQP 1.0 implementation. Summary of changes: - brokertest.py: configurable support for of swig vs. native and amqp0-10 vs. 1.0 - default to swig+amqp1.0 if swig is available, native+amqp0-10 otherwise - qpidtoollibs/broker.py: enable use of swig client with BrokerAgent - Swig python client: - support for passing client_properties/properties. - expose AddressHelper pn_data read/write as PnData helper class - set sender/receiver capacity on creation - limited disposition support - rejected messages. - support for additional timeout parameters - expose messaging::Logger, allow log configuration to be set from python. - ha_tests.py: - bind, delete policies not supported by AMQP 1.0, switched to using BrokerAgent QMF. - pass protocol:amqp1.0 connection-option to c++ test clients (qpid-send, qpid-receive) - TX tests forsce use of 0-10 protocol (but still with Swig client if enabled.) - Broker fixes: - Queue::Settings::isTemporary was set in the 0-10 SessionAdapter, moved to Broker::createQueue. - broker::amqp::Session was always setting an exclusive owner in createQueue git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585588 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5660: [legacystore] Python tests fail with syntax error on Python 2.4Kim van der Riet2014-04-031-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1584347 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5362: Bugfix for qpid_qls_analyzeKim van der Riet2014-04-011-15/+15
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1583778 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4738: Fix qpid-ha status --all when used with a standalone broker.Alan Conway2014-03-241-2/+2
| | | | | | | Previously qpid-ha status --all on a standalone broker produced no output. Now it prints the status of the standalone broker. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580962 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5643: qpid-route route map does not pass credentials to other brokers ↵Pavel Moravec2014-03-241-1/+3
| | | | | | in the route map git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1580827 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5362: No store tools exist for examining the journals - Bugfix and ↵Kim van der Riet2014-03-186-852/+1224
| | | | | | reorganization of qls python modules. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1578899 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5604: Update comments to If we're on Cygwin we need to convert to ↵Fraser Adams2014-03-118-8/+8
| | | | | | Windows path. as per Jan's suggestion git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1576460 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5604: Added Cygwin support to all the scripts in qpid/tools/src/java/binFraser Adams2014-03-108-6/+84
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1576020 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5604: Added the Cygwin patch to QpidRestAPI.sh initially to see if it ↵Fraser Adams2014-03-081-0/+10
| | | | | | works - it doesn't break on Linux, but I can't test Cygwin myself git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575537 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5614: Fix problems caused by changes to Java Broker Logging in QPID-5611Fraser Adams2014-03-081-4/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575533 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5614: Initial fix of the issues. The QMF2 Plugin compiles again and ↵Fraser Adams2014-03-0810-161/+156
| | | | | | mostly works, but there are issues with the bindings and subscriptions - though I think that this might be a problem with the Java Broker Management Model git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575530 13f79535-47bb-0310-9956-ffa450edef68
* JIRA:QPID-5555 Get the QMF plugin working again. There was still a gotcha on ↵Fraser Adams2014-02-235-12/+45
| | | | | | the ExclusivityPolicy, which compiled OK but gave ClassCastExceptions. This commit sorts that problem and also tweaks the returned port to report the TCP based AMQP port not the WS one git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1571021 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5555 : fix breakage in the broker QMF plugin caused by rework to broker ↵Robert Godfrey2014-02-184-6/+11
| | | | | | internals git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1569525 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5362: Bugfixes and enhancements for qpid_qls_analyzeKim van der Riet2014-02-054-65/+150
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1564808 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5541: HA incorrect options for expected-backups in qpid-ha toolAlan Conway2014-02-051-3/+0
| | | | | | Remove invalid --backup option from qpid-ha set and query commands. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1564797 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5530: [legacystore] store_chk raises "Operation on non-existent record: ↵Pavel Moravec2014-02-011-2/+11
| | | | | | operation=unlock; rid=.." on aborted DTX transaction in TplStore git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1563387 13f79535-47bb-0310-9956-ffa450edef68
* QPID-5362: Bugfixes and enhancements to qpid_qls_analyzeKim van der Riet2014-01-274-153/+398
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1561848 13f79535-47bb-0310-9956-ffa450edef68