Commit Graph

3396 Commits

Author SHA1 Message Date
Gary Tully 3596f3706f resolve potential concurrent mod of LinkedHashMap, reads can modify as map is access ordered
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1036448 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 13:26:33 +00:00
Gary Tully eb034b4bc9 applied patch and test from https://issues.apache.org/activemq/browse/AMQ-3029 with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1035264 13f79535-47bb-0310-9956-ffa450edef68
2010-11-15 13:20:31 +00:00
Gary Tully 4fbf92de82 improve jdbc durable sub performance for long running subs and resolve regression in selector test, related to https://issues.apache.org/activemq/browse/AMQ-2985, https://issues.apache.org/activemq/browse/AMQ-2980, expose maxRows on jdbc persistence adapter to allow it to be increased for really large selectors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1035202 13f79535-47bb-0310-9956-ffa450edef68
2010-11-15 10:00:56 +00:00
Gary Tully 4679c8a788 remove priority flag from default jdbc impl as that is shared across dests, leads to conflict between priority and non priority dests, limit rowSize returned from durable fetch so we don't hog memory or return too few matches: https://issues.apache.org/activemq/browse/AMQ-2980
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1034466 13f79535-47bb-0310-9956-ffa450edef68
2010-11-12 16:51:26 +00:00
Bruce Snyder c9c6e62a60 AMQ-3022 - Reverting changes for transaction suspend/resume due to broken tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1034430 13f79535-47bb-0310-9956-ffa450edef68
2010-11-12 15:39:37 +00:00
Gary Tully 5ce31fae87 resolve https://issues.apache.org/activemq/browse/AMQ-2939 - allow xbean config validation to be disabled, url of the form xbean:...?validate=false will do it
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1034032 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 18:40:26 +00:00
Bosanac Dejan 52aaa0a7f3 fixing licenses
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033853 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 09:26:35 +00:00
Gary Tully 49824ecab6 enable scheduler for test config: https://issues.apache.org/activemq/browse/AMQ-2967
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033834 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 08:25:42 +00:00
Gary Tully 6aacb034ee resolution to duplicate issue from https://issues.apache.org/activemq/browse/AMQ-2980 - contention over active flag caused premature dispatch on reactivation such that there could be duplicates, fixing the contention sorts this, final piece of the puzzle, test now works as expected
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033607 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 17:44:06 +00:00
Gary Tully 6dea944be6 fix issue from new test for https://issues.apache.org/activemq/browse/AMQ-2985 - when acking as unmatched, the matching messages that lie inbetwen the sequences need to be added to the ack locations to ensure they don't get deleted when other consumers are done with them. test now enabled for kahaDB
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033581 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 16:44:23 +00:00
Gary Tully 5baf5f5e76 improve logging by adding sub key
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033487 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 14:26:30 +00:00
Gary Tully d8b11896ab additional test for https://issues.apache.org/activemq/browse/AMQ-2985 that shows issue with kahadb and overlapping durable and non durable subs with occasional filter match
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033469 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 13:53:53 +00:00
Bosanac Dejan 69dc0d4940 https://issues.apache.org/activemq/browse/AMQ-2980 - modify the test case to show dupliacte problem
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033468 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 13:52:40 +00:00
Gary Tully fa4481c421 more improvements on https://issues.apache.org/activemq/browse/AMQ-2980 - split prioritised and regular statements, have ack row per priority and fix up deletion and interleaved durable subs. Simpler slq improves throughput
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033076 13f79535-47bb-0310-9956-ffa450edef68
2010-11-09 16:34:54 +00:00
Bosanac Dejan 3e8abcc43f https://issues.apache.org/activemq/browse/AMQ-3020 - imrpove test timings
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1032969 13f79535-47bb-0310-9956-ffa450edef68
2010-11-09 12:40:38 +00:00
Bosanac Dejan a23bb3053d https://issues.apache.org/activemq/browse/AMQ-3020 - remove obsolete test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1032919 13f79535-47bb-0310-9956-ffa450edef68
2010-11-09 10:59:19 +00:00
Bosanac Dejan 4f327e091b https://issues.apache.org/activemq/browse/AMQ-3020 - missing properties file
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1032904 13f79535-47bb-0310-9956-ffa450edef68
2010-11-09 10:06:33 +00:00
Bruce Snyder 4411ff6680 AMQ-3022 - Improve error message when a transaction is attempted to be suspended/resumed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1032658 13f79535-47bb-0310-9956-ffa450edef68
2010-11-08 18:19:23 +00:00
Bosanac Dejan 34f19297d4 https://issues.apache.org/activemq/browse/AMQ-3020 - supress browsers over network
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1032647 13f79535-47bb-0310-9956-ffa450edef68
2010-11-08 17:45:35 +00:00
Bosanac Dejan 7983abfcd6 https://issues.apache.org/activemq/browse/AMQ-3020 - test case
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1032591 13f79535-47bb-0310-9956-ffa450edef68
2010-11-08 14:51:11 +00:00
Gary Tully b6a9c70ef0 allow a 0 closeTimeout to mean infinite, currently it turns the sync request into an async request
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1031761 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 20:05:18 +00:00
Bosanac Dejan 2bdddc2021 https://issues.apache.org/activemq/browse/AMQ-3020 - intial tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1031656 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 16:27:58 +00:00
Gary Tully ca668019a0 starter test case for https://issues.apache.org/activemq/browse/AMQ-2908 - it works though
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1031136 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 18:37:00 +00:00
Gary Tully 06cbebc8da further resolution to https://issues.apache.org/activemq/browse/AMQ-2980, concurrent producers was still problematic as the store needed to be traversed multiple times, requiring ack locations per priority. Resolution to https://issues.apache.org/activemq/browse/AMQ-2551 fell out of decreasing the cleanup interval in some of the tests, cleanup needs an exclusive lock so it won't cause contention
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1030928 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 13:13:37 +00:00
Bosanac Dejan e96229803d https://issues.apache.org/activemq/browse/AMQ-3013 - additional fix
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1030888 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 11:48:32 +00:00
Bosanac Dejan 4fc1712cdc https://issues.apache.org/activemq/browse/AMQ-3013 - durable subs and jmx
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1030490 13f79535-47bb-0310-9956-ffa450edef68
2010-11-03 15:06:21 +00:00
Gary Tully 66a945a8f1 resolve duplicate issue with concurrent durable subs and dlq, suppress the duplicates in the default Dead letter strategy. With no duplicates, concurrentStoreAndDispatchQueues true is fine. resolve https://issues.apache.org/activemq/browse/AMQ-2584
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1030013 13f79535-47bb-0310-9956-ffa450edef68
2010-11-02 12:05:00 +00:00
Gary Tully 0c3117aac5 additional offiline test, and enable the jdbc variants - https://issues.apache.org/activemq/browse/AMQ-2985
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1028702 13f79535-47bb-0310-9956-ffa450edef68
2010-10-29 11:46:31 +00:00
Gary Tully 518f0ce146 revert to manual additions to the schema mapping so that previous versions are not dropped from the map: resolve https://issues.apache.org/activemq/browse/AMQ-3005
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1028288 13f79535-47bb-0310-9956-ffa450edef68
2010-10-28 13:18:56 +00:00
Gary Tully 5edede1d0b partial fix for https://issues.apache.org/activemq/browse/AMQ-2939 - allow the management context port values to be properties by ensuring that their schema is of type string rather than integer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1028278 13f79535-47bb-0310-9956-ffa450edef68
2010-10-28 12:47:47 +00:00
Gary Tully 4d265fd5d5 verify that all journal files are reclaimed after duplicate messages with concurrentStoreAndDispatchQueues=false, durable subs must be unsubscribed also https://issues.apache.org/activemq/browse/AMQ-2584
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1028277 13f79535-47bb-0310-9956-ffa450edef68
2010-10-28 12:36:35 +00:00
Bruce Snyder 8a1f994bf5 AMQ-2965 - Patched to allow ActiveMQ to start up when DNS resolution is unavailable
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1028143 13f79535-47bb-0310-9956-ffa450edef68
2010-10-27 23:56:40 +00:00
Gary Tully c290a17460 add test variant that demonstrates the need to disable the audit on the dlq when there is a concurrent consumer with multiple durable subs, some duplicate sends will not be caught (if they are acked in the mean time) so that audit stop needs to be disabled such that they can be consumed. This points to the need for a dlq per durable sub. work around for: https://issues.apache.org/activemq/browse/AMQ-2584
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1027886 13f79535-47bb-0310-9956-ffa450edef68
2010-10-27 10:18:36 +00:00
Bosanac Dejan ef1a3c1f67 https://issues.apache.org/activemq/browse/AMQ-2983 - sticky kahadb log files concurrent tx
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1027863 13f79535-47bb-0310-9956-ffa450edef68
2010-10-27 09:14:46 +00:00
Gary Tully 6fd292d885 fix regression of https://issues.apache.org/activemq/browse/AMQ-2870 from refactoring of fix for https://issues.apache.org/activemq/browse/AMQ-2985 - unmatched acks are now stored as negative sequence ids so that we can differenciate between a durables that have acked messages after receipt and those that have acked because of unmatched. Unmatched messages are now deleted in the normal way
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1027644 13f79535-47bb-0310-9956-ffa450edef68
2010-10-26 16:52:08 +00:00
Gary Tully 3b51a692be resolve https://issues.apache.org/activemq/browse/AMQ-2999 - use widlcard address for tcp connector
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1027461 13f79535-47bb-0310-9956-ffa450edef68
2010-10-26 11:01:57 +00:00
Bosanac Dejan 1aa6cbc56a https://issues.apache.org/activemq/browse/AMQ-2982 - sticky kahadb log files on rollback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1027453 13f79535-47bb-0310-9956-ffa450edef68
2010-10-26 10:33:05 +00:00
Bosanac Dejan 6ebc82c5c4 https://issues.apache.org/activemq/browse/AMQ-2982 - sticky kahadb log files on rollback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1027451 13f79535-47bb-0310-9956-ffa450edef68
2010-10-26 10:32:31 +00:00
Gary Tully 107509fac3 ensure datasource is not shutdown for setup
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1027447 13f79535-47bb-0310-9956-ffa450edef68
2010-10-26 10:25:18 +00:00
Timothy A. Bish 8262eec63d apply patch for: https://issues.apache.org/activemq/browse/AMQ-2988
with modifications to make the properties map unmodifiable and use the generic Collections.emptyMap method instead of creating a new empty map.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1027282 13f79535-47bb-0310-9956-ffa450edef68
2010-10-25 21:58:04 +00:00
Gary Tully 5477bc007f fix xbean qdox parser error with static initialiser, use block instead
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1026545 13f79535-47bb-0310-9956-ffa450edef68
2010-10-23 02:13:58 +00:00
Gary Tully 6ddbba4850 additional tests and refactoring of fix for https://issues.apache.org/activemq/browse/AMQ-2985, not updating subscriptionAck with an unmatched message resolves recovery of unmatched selector durables, reveting the previous change
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1026543 13f79535-47bb-0310-9956-ffa450edef68
2010-10-23 01:36:13 +00:00
Gary Tully 514ef7de46 additional tests and refactoring of fix for https://issues.apache.org/activemq/browse/AMQ-2985, selector scan was off by one and unmatched acking skipped some messages leaving them available to subsequent consumers. Also acking always left the first consumed message available for a reconnected durable
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1026457 13f79535-47bb-0310-9956-ffa450edef68
2010-10-22 19:31:18 +00:00
Bosanac Dejan df7cb7727b https://issues.apache.org/activemq/browse/AMQ-2970 - refactor to avoid duplicate getConnectionContext() method
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1026254 13f79535-47bb-0310-9956-ffa450edef68
2010-10-22 08:55:08 +00:00
Gary Tully 9e885efca2 seems to be regression from: https://issues.apache.org/activemq/browse/AMQ-2970 - but there is some mix up with the creation of an admin connection context. having the BrokerView do the right thing works for the moment... but this needs some more eyes, test shows the issue when context is missing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1026092 13f79535-47bb-0310-9956-ffa450edef68
2010-10-21 18:17:42 +00:00
Bosanac Dejan 57737968fb add some traces to enable easier monitor of message flow
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1026008 13f79535-47bb-0310-9956-ffa450edef68
2010-10-21 14:14:38 +00:00
Gary Tully 3432a75110 jdbc variant of https://issues.apache.org/activemq/browse/AMQ-2985 - jdbc store cannot ack out of order, the cleanup task query needed to be priority aware. fix for https://issues.apache.org/activemq/browse/AMQ-2980 JDBC - priority needed to be considered in count and recovery, additional tests included
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1025939 13f79535-47bb-0310-9956-ffa450edef68
2010-10-21 10:58:51 +00:00
Bosanac Dejan ea82d5de5b https://issues.apache.org/activemq/browse/AMQ-2993 - virtual topics and advisory messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1025905 13f79535-47bb-0310-9956-ffa450edef68
2010-10-21 09:32:47 +00:00
Timothy A. Bish a60eeaa7ae apply patch (with modification to fix a null pointer violation case) fixes: https://issues.apache.org/activemq/browse/AMQ-2990
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1025620 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 15:48:56 +00:00
Bosanac Dejan 51ef021073 https://issues.apache.org/activemq/browse/AMQ-2986 - JMX and store percent usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1023795 13f79535-47bb-0310-9956-ffa450edef68
2010-10-18 13:38:26 +00:00