Commit Graph

7228 Commits

Author SHA1 Message Date
Timothy A. Bish 540b1c6a89 fix for: https://issues.apache.org/jira/browse/AMQ-4518
Allow purge to disable message expiration check when paging in Messages to be purged.  Avoids attempts at sending messages to a DLQ during a purge operation and in firing advisory messages for expired messages which are being thrown out by request. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480731 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 17:50:26 +00:00
Hiram R. Chirino 25356f2695 Fixes issue identified in APLO-245 where index does not seem to get cleaned up / compacted. Fix ported over from Apollo.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480711 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 16:11:52 +00:00
Hiram R. Chirino d98ac90f28 Suspend/Resume index compactions instead of closing out the index.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480710 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 16:11:36 +00:00
Hiram R. Chirino 3ef7911a1d Fixes bug identified in APLO-284. Ported fix over from Apollo.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480709 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 16:11:26 +00:00
Hiram R. Chirino 4a16c1ff27 Implements AMQ-4526: ActiveMQ should automatically restart if a Locker looses it's lock.
* Adds a new broker config option 'restartAllowed'.  Set it to false to revert to the preserve behavior.
* Adds a new 'restart' JMX operation on the broker
* The default IO exception handler will trigger a broker restart instead of a broker stop.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480325 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 15:34:00 +00:00
Timothy A. Bish b5f6bc3c90 https://issues.apache.org/jira/browse/AMQ-4524
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480282 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 14:05:30 +00:00
Bosanac Dejan fc8c8d339e https://issues.apache.org/jira/browse/AMQ-4522 - set timeToLive when sending a message using JMX
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480189 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 09:15:17 +00:00
Timothy A. Bish ff9b80040b fix for: https://issues.apache.org/jira/browse/AMQ-4520
Load BouncyCastle if present in lib dir.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480117 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 22:08:28 +00:00
Timothy A. Bish 0bb9013769 Fix for: https://issues.apache.org/jira/browse/AMQ-4517
Don't send MessageDLQd advisory for Message that aren't sent to a DLQ

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480087 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 21:17:34 +00:00
Christian Posta 5a299b76eb fix for https://issues.apache.org/jira/browse/AMQ-4519 - MasterLevelDBStore does not shutdown its protocol server when stopped
made fix and added test

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480060 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 20:29:56 +00:00
Christian Posta ee97df7422 fixed some small code mistypes in replicated leveldb.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480059 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 20:29:45 +00:00
Timothy A. Bish d7aaca5034 Fix and test for: https://issues.apache.org/jira/browse/AMQ-4513
Makes the locking in RegionBroker a bit more fine grained.  We hold a lock only for a short time and allow destination adds that aren't on the same destination to continue on concurrently.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1479963 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 16:13:18 +00:00
Christian Posta 866440dfb2 Fix for https://issues.apache.org/jira/browse/AMQ-4516 - Don't decrement topic enqueues when messages are expired
Removed the call to decrement the counters, and added unit test

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1479925 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 14:39:25 +00:00
Gary Tully 864fdbebef https://issues.apache.org/jira/browse/AMQ-4428 - patch applied with thanks - errors are now logged and throwables propagate
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1479852 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 10:51:40 +00:00
Timothy A. Bish 436f892c16 fix for: https://issues.apache.org/jira/browse/AMQ-4468
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478976 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 20:54:31 +00:00
Gary Tully bf071376b5 https://issues.apache.org/jira/browse/AMQ-3097 - apply patch with some additional unit test, with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478973 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 20:43:59 +00:00
Timothy A. Bish 3a8eb74a9f Fix and test for: https://issues.apache.org/jira/browse/AMQ-4505
When a broker was stopping it was sending out a cluster update after tearing down its bridges so any client connected to it would lose its awareness of other brokers in the cluster. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478835 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 15:21:25 +00:00
Bosanac Dejan 7450a32ae7 https://issues.apache.org/jira/browse/AMQ-4495 - always get a max batch of messages from the store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478823 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 14:50:56 +00:00
Hiram R. Chirino 943011e92e Remove commented out tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478549 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 21:07:41 +00:00
Hiram R. Chirino ede1705e34 The replicated leveldb store will now stash the last known good replica before starting to replicate with a new master. If the replication does not fully synchronize before a slave failure occurs, the store will revert back to the the stashed state.
If a slave connection encounters an error, try to reconnect again after 1 second.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478548 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 21:07:04 +00:00
Timothy A. Bish b9cc24bdb6 Swap expected and actual so that they match the intent of the assertion, otherwise the error message is misleading.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478395 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 14:53:52 +00:00
Gary Tully d687324465 https://issues.apache.org/jira/browse/AMQ-4507 - apply fix with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478357 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 13:03:04 +00:00
Christian Posta 2a1bc72c0c test to help debug hawtio not being able to browse DLQ...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478266 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 04:33:10 +00:00
Christian Posta 723e117b5f added sample config for replicated leveldb store.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478231 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 23:29:15 +00:00
Timothy A. Bish e777126d30 fix for: https://issues.apache.org/jira/browse/AMQ-4501
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478184 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 20:53:51 +00:00
Gary Tully 4742c7d86f https://issues.apache.org/jira/browse/AMQ-4504 - ensure all dests in a composite get a chance to dispatch to a consumer after an ack
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478183 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 20:49:08 +00:00
Timothy A. Bish fbac51c8f8 https://issues.apache.org/jira/browse/AMQ-4501
Partial fix, perform a proper URI comparison to avoid an unnecessary reconnect bounce.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478083 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 16:33:57 +00:00
Timothy A. Bish d52e5910a5 apply patch: https://issues.apache.org/jira/browse/AMQ-4500
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1477830 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 21:12:28 +00:00
Hiram R. Chirino e507461dbc Get the replicatedLevelDB element working in the activemq standalone config.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1477709 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 16:11:52 +00:00
Bosanac Dejan 5cbb4bfc12 https://issues.apache.org/jira/browse/AMQ-4467 - cursor memory usage when pfc is off
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1477574 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 11:44:03 +00:00
Hiram R. Chirino 1eeae77339 Added an new ElectingLevelDBStore which handles the M/S election bits using ZooKeeper.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1477387 13f79535-47bb-0310-9956-ffa450edef68
2013-04-29 22:33:26 +00:00
Hiram R. Chirino ca814802ca Add more replication tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1476786 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 15:03:24 +00:00
Hiram R. Chirino 5c6b8ba11f Adding an initial spike of a M/S replicated leveldb store. Replication protocol is working nicely, just need automated M/S election bits.
Move tests in a test package.
Rename the HA* classes to DFS*.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1476719 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 03:53:57 +00:00
Timothy A. Bish 3039b67cb2 fix for: https://issues.apache.org/jira/browse/AMQ-4351
Ensure the destination statistics are updated on durable sub deactivate. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1476433 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 22:51:50 +00:00
Timothy A. Bish 7057e819eb Fix for: https://issues.apache.org/jira/browse/AMQ-4488
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1475842 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 16:25:51 +00:00
Gary Tully f2b01a7f01 https://issues.apache.org/jira/browse/AMQ-4486 - fix and test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1475798 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 14:33:54 +00:00
Gary Tully 66e8011e9e https://issues.apache.org/jira/browse/AMQ-4485 - ensure cursor updates in same order as store orderindex via beforeCompletion with index lock. The before completion tracks ordered work that first thread completes as a unit. All updates to a destination are combined to a single sync, such that there is no cursor contention between transactions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1475734 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 12:47:20 +00:00
Hiram R. Chirino 163ad5d4a9 Fix for AMQ4472: We can eagerly close a txed consumer if it has not delivered any messages.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1471673 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 21:01:24 +00:00
Bosanac Dejan e1f170da6e https://issues.apache.org/jira/browse/AMQ-4483 - improve dlq managment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1471420 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 14:01:16 +00:00
Gary Tully 705b3c5f9d https://issues.apache.org/jira/browse/AMQ-4472 - test case that shows the problem with prefetched messages and delayed close till commit
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1470459 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 11:29:48 +00:00
Timothy A. Bish 7e53814928 Fix and test for: https://issues.apache.org/jira/browse/AMQ-4475
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1469013 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 18:07:24 +00:00
Christian Posta 893a1ce88c updated for https://issues.apache.org/jira/browse/AMQ-4473 Allow enabling remote debug from newly created broker instance
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1468733 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 03:19:59 +00:00
Timothy A. Bish 3bf9d0cceb fix for: https://issues.apache.org/jira/browse/AMQ-4212
fix for: https://issues.apache.org/jira/browse/AMQ-2832

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1468171 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 18:08:15 +00:00
Bosanac Dejan e6c6951bed https://issues.apache.org/jira/browse/AMQ-4275 - more improvements to activemq-maven-plugin; include all dependencies and use default value for the project
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467950 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 11:59:08 +00:00
Timothy A. Bish 3f9b6ed391 fix and test for: https://issues.apache.org/jira/browse/AMQ-4469
Rewrote the unit test as a JUnit 4 test and remove hard coded 61616 port dep. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467510 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 23:02:48 +00:00
Timothy A. Bish 2aba7845db AMQ-4212 Add KahaDB v4 data for use in testing the upgrade to v5 that this issue requires.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467377 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 17:42:18 +00:00
Bosanac Dejan 15affd0755 https://issues.apache.org/jira/browse/AMQ-3706 - improve rebalance distribution which is more apparent when only two brokers are involved
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467241 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 11:52:15 +00:00
Timothy A. Bish c7308a1183 Add a KahaDB trace entry for reference.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467106 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 21:45:16 +00:00
Christian Posta e33e994f91 Merge branch 'perf-tool-broker-gplus-thread' into trunk
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1466499 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 14:47:28 +00:00
Timothy A. Bish 32042a5b8b update some deps with bugfix versions.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1466287 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 23:29:40 +00:00