Commit Graph

7051 Commits

Author SHA1 Message Date
Timothy A. Bish f46b184f6c fix and test for: https://issues.apache.org/jira/browse/AMQ-4413
For durable subscriptions the PrefetchSubscription can't drop messages in dispatchPending otherwise they are never added back into the pending cursor. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483111 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 22:22:39 +00:00
Hiram R. Chirino 5a192e790d Adding a Promise class that can allow us to use callbacks to get future computation results.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482954 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 16:59:50 +00:00
Hiram R. Chirino 2ecb5eaa1b Don't delay flushes for now. Seems to cause more harm than good.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 13:58:25 +00:00
Hiram R. Chirino c5788d24bc Reduce the amount of work done while the sendLock is acquired.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482805 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 13:11:07 +00:00
Hiram R. Chirino 548c19496c reduce the number of times the sendSyncs map is accessed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482800 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 13:02:27 +00:00
Hiram R. Chirino 0deda2501d Fixing regression in last commit.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482794 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:44:13 +00:00
Bosanac Dejan e06685fe81 https://issues.apache.org/jira/browse/AMQ-4000 - as part of this feature we need to properly send advisories when durable sub unregisters
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482790 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:31:09 +00:00
Hiram R. Chirino 8461158178 Fixes AMQ-4535: Activemq configured with leveldb commit fail when accessed by PutGet from IBM Perf Harness
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482789 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:30:45 +00:00
Hiram R. Chirino 842630c8c7 Implement some tracking of producer positions in the LevelDB store to help the broker to filter out dups.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482788 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:30:34 +00:00
Hiram R. Chirino 1399cf9522 Fixing regression introduced by AMQ-4529 the JdbcXARecoveryBrokerTest was failing.
Switching the jdbc store to use the entryLocator instead of the dataLocator

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482334 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 13:49:09 +00:00
Christian Posta 63c0ef179a Fix for https://issues.apache.org/jira/browse/AMQ-4534 When using ElectingLevelDBStore cannot delete all messages on startup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482180 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 03:37:39 +00:00
Gary Tully 58b9a83fe8 https://issues.apache.org/jira/browse/AMQ-4532 - fix and test - ensure disposed exception is propagated to clients on vm server shutdown
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482117 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 21:43:39 +00:00
Timothy A. Bish ce67624cd4 Fix and test for: https://issues.apache.org/jira/browse/AMQ-4484
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482017 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 18:24:33 +00:00
Timothy A. Bish e731c39af7 ix and test for: https://issues.apache.org/jira/browse/AMQ-4531
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481984 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 17:45:18 +00:00
Timothy A. Bish 2bd0e5703e apply fix and patch for: https://issues.apache.org/jira/browse/AMQ-4530
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481930 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 15:36:03 +00:00
Bosanac Dejan 87a29847bb upgrading leveldbjni to 1.7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481849 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 13:49:20 +00:00
Hiram R. Chirino 875885dfa9 Increase the default auto compaction ratio.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481528 13f79535-47bb-0310-9956-ffa450edef68
2013-05-12 11:23:40 +00:00
Hiram R. Chirino 30038957b6 Add a storeConentAndClear() method to message so that we can lower the memory impact of embedded broker usage.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481527 13f79535-47bb-0310-9956-ffa450edef68
2013-05-12 11:23:30 +00:00
Timothy A. Bish b820ac2bf9 fix for: https://issues.apache.org/jira/browse/AMQ-4512
Usage and MemoryUsage sync fixes to keep state consistent during thread contention.  Test case added.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481106 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 17:13:48 +00:00
Hiram R. Chirino e0ae445900 For AMQ-4338: Lets see if using a newer MQTT client helps. Also hook into the client tracing and use the auto fail test support base class to timeout the tests if they take too long.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481092 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 16:52:47 +00:00
Hiram R. Chirino 2572e2bd04 Add a little main class to the leveldb store module to make it easier to run a broker from your IDE.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481014 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 14:03:39 +00:00
Hiram R. Chirino d344aa7a42 Fixes AMQ-4529: leveldb store NPEs when you send to a composite destination.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481013 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 14:03:31 +00:00
Hiram R. Chirino 2c06326506 Fixes AMQ-4251: Scala compile warnings - Compiling activemq-leveldb-store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480811 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 22:17:47 +00:00
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