Commit Graph

889 Commits

Author SHA1 Message Date
gtully 6cc2c1190d AMQ-6361 - fix contention over expiry processing with expiry task and client expiry ack, unit test regression sorted. 2016-07-22 15:18:31 +01:00
gtully 2a815c2e08 AMQ-6370 - move cleanup lock to connection allocation to avoid contention with between store and connection pool. pool connection grant or block is now guarded by store lock which lasts till connection is closed 2016-07-21 10:54:40 +01:00
Christopher L. Shannon (cshannon) 39184e2fb0 https://issues.apache.org/jira/browse/AMQ-6366
Fixing the duplex bridge case for restarting durable subscriptions when
dynamicOnly is false
2016-07-19 11:31:44 -04:00
Timothy Bish f43c090809 https://issues.apache.org/jira/browse/AMQ-6362
Add option connectResponseTimeout to allow a stuck connection in
ensureConnectionInfoSent from stalling out a client.  Timeout is
disabled by default.
2016-07-18 11:30:38 -04:00
Timothy Bish a3a5a1affa https://issues.apache.org/jira/browse/AMQ-6336
Ensure that when expired messages are handled client side that pull
consumers get a chance to see it and send a new pull request complete an
outstanding timed pull.
2016-07-15 16:45:35 -04:00
Timothy Bish cd5ea6c27f https://issues.apache.org/jira/browse/AMQ-6361
Honor the expired ack from the client as the authority on expiration
2016-07-15 15:08:26 -04:00
Christopher L. Shannon (cshannon) d635a36940 https://issues.apache.org/jira/browse/AMQ-6352
Fixing PList size tracking by moving the null assignment on removal to
after the onRemoval method is called to make sure that the decrement is
done properly.
2016-07-12 10:27:57 -04:00
Christopher L. Shannon (cshannon) c02bc64846 https://issues.apache.org/jira/browse/AMQ-5426
Fixing a race condition in ActiveMQMessageConsumer that could cause a
NPE when the consumer is closing by only modifing pendingAck inside of
the deliveredMessagesMutex

Thanks to Michael Wong for providing the test case for this issue.
2016-07-05 20:35:07 +00:00
Christopher L. Shannon (cshannon) 3856c3999a Revert "https://issues.apache.org/jira/browse/AMQ-5426"
This reverts commit 6bfa13b6e7.
2016-07-05 20:27:02 +00:00
Christopher L. Shannon (cshannon) 6bfa13b6e7 https://issues.apache.org/jira/browse/AMQ-5426
Fixing a race condition in ActiveMQMessageConsumer that could cause a
NPE when the consumer is closing

Thanks to Michael Wong for providing the test case for this issue.
2016-07-05 20:05:29 +00:00
gtully 30ff378a35 increase service logging, seems npe in the mix on intermittent failure 2016-07-05 14:08:43 +01:00
Timothy Bish 31c55f7510 https://issues.apache.org/jira/browse/AMQ-6339
Add support for AMQP client to connect using WebSockets.
2016-06-30 14:52:40 -04:00
Dejan Bosanac 3dfda807f6 https://issues.apache.org/jira/browse/AMQ-6336 - queue browser delivers expired messages 2016-06-23 17:47:15 +02:00
Dejan Bosanac 1faa4afa90 https://issues.apache.org/jira/browse/AMQ-6331 - Honor excluded destinations in static routing on network connectors 2016-06-21 15:07:30 +02:00
Timothy Bish 9ac5f83473 Fix test failure in CI
Has race condition on the ArrayList it uses to track subs and 
Fix the unreliable sleep used to track locked messages in subs
Ensure Broker is shut down on test completion.
2016-06-16 12:26:50 -04:00
Timothy Bish c0713415f5 https://issues.apache.org/jira/browse/AMQ-6325
Fix test that fails now that the parser checks the full expression.
2016-06-16 10:59:08 -04:00
Dejan Bosanac 36237cb30f https://issues.apache.org/jira/browse/AMQ-6322 - fix NetworkRouteTest failure 2016-06-15 12:59:52 +02:00
Timothy Bish 7b207567d9 https://issues.apache.org/jira/browse/AMQ-6325
Fix issue with selector parser.
2016-06-14 12:49:08 -04:00
Christopher L. Shannon (cshannon) a953f11d0e https://issues.apache.org/jira/browse/AMQ-6323
Applying reduceMemoryFootprint for persistent Topic messages
2016-06-14 14:36:37 +00:00
Timothy Bish cf750d5cee Wait for bridge formation before attempting to receive otherwise the
timed receive might not work.
2016-06-10 11:22:45 -04:00
gtully f548aafa81 move test utility to broker module to allow reuse from jdbc module tests 2016-06-10 10:20:33 +01:00
Timothy Bish 9f5fff795d https://issues.apache.org/jira/browse/AMQ-5621
Ensure that connections using VM transport are closed.
2016-06-09 18:37:09 -04:00
Timothy Bish 5fd307cd9f Ensure that connections get closed to allow the vm transport resources
to get cleaned up.
2016-06-07 09:29:41 -04:00
Jonathan Malek 6bf5987921 A fix for AMQ-6310
Checking for leading wildcard in the prefix for a virtualtopic,
modifying the behavior of shouldDispatch in the VirtualTopicInterceptor.
2016-06-04 16:51:27 -07:00
gtully 857597ca9e AMQ-4181 - browser 'may' have more than 1 so message 'may' remain 2016-06-03 15:15:11 +01:00
Timothy Bish 3c5c5779e2 Remove version definition for managed dependency 2016-05-26 18:00:50 -04:00
gtully 62ab55683f increase the lease to allow kahadb recovery, ci intermittent failure 2016-05-26 11:30:32 +01:00
Timothy Bish 0757cdcd59 Cleanup the tearDown method to ensure we follow on to the super tearDown
where the broker is stopped.
2016-05-25 12:15:21 -04:00
gtully e467f34cc1 longer receive timeout on first message, intermittent ci failure 2016-05-25 12:45:07 +01:00
gtully 281fbb1f9d tidy up close for vm broker - seems ci failure of InMemeoryJmsSchedulerTest is related to overlap between tests of vm transport 2016-05-25 12:34:07 +01:00
gtully fe9d99e7a0 AMQ-3166 - implement rollbackOnlyOnAsyncException such that async exceptions on transactional sends or acks result in the transaction being marked rollback only and commit failing with an exception. Test that shows current state of play using alwaySendSync or AsyncCallback. rollbackOnlyOnAsyncException enabled by default. 2016-05-25 11:24:43 +01:00
gtully f46b2927a4 fix intermittent ci failure - ensure no expiry before first dispatch 2016-05-24 10:47:34 +01:00
gtully b4e35fe8a3 AMQ-4181 - revert mod to testQueueBrowserWith2ConsumersInterleaved which cause intermittent ci failure - browse is a snapshot at time of creation. tidy up some gaps in pagein logic sync 2016-05-23 13:29:39 +01:00
gtully 7c04aa9909 reduce test message size and quantity for ci 2016-05-20 15:37:24 +01:00
gtully c2230fda4b https://issues.apache.org/jira/browse/AMQ-6286 - refine fix to distinguish multiple consumers in a transaction, verify insertion at head will preserve order 2016-05-18 10:09:39 +01:00
Timothy Bish a2720c4653 https://issues.apache.org/jira/browse/AMQ-6293
Clean up the test, the times were causing CI failure.  Turn off
persistence and fix a couple other things, reduced time to 2.5 secs
while still reproducing with fix removed.
2016-05-16 11:02:20 -04:00
Christopher L. Shannon (cshannon) 1241e4120a https://issues.apache.org/jira/browse/AMQ-6293
Fixing Queue destination statistics in dropMessage by adding sync in
between the check for dropped and actually dropping the message plus
fixing dequeue stats so messages aren't counted twice
2016-05-14 16:20:41 +00:00
gtully d7b5a62bb0 https://issues.apache.org/jira/browse/AMQ-6286 - variant on test with n consumers sharing a session 2016-05-13 15:50:13 +01:00
gtully 3c0a4d960e unit test to verify matching durable sub can statically forward topic 2016-05-12 22:11:25 +01:00
Timothy Bish 71893f1434 Allow the HTTP test to have extra time to wait for all messages to
arrive as the transmission rate is much slower.
2016-05-10 10:59:12 -04:00
Timothy Bish 3da9b0720e https://issues.apache.org/jira/browse/AMQ-5621
Remove hard coded port as the bridge brokers method doesn't need the
port to be fixed.  Turn off JMX since the test doesn't use it.
2016-05-10 10:05:05 -04:00
Timothy Bish 809d5b9bc8 https://issues.apache.org/jira/browse/AMQ-5621
Clean up, remove sleep and some unused code.
2016-05-10 09:56:19 -04:00
gtully 604f707d4d https://issues.apache.org/jira/browse/AMQ-6286 - refactor insertAtHead from pendinglist to ordered variant 2016-05-10 11:45:27 +01:00
gtully f47b370573 https://issues.apache.org/jira/browse/AMQ-6286 extend strictOrderDispatch to retain order of redispatched messages for a single consumer 2016-05-09 23:06:19 +01:00
gtully 1a8e17fbc3 tidy up test 2016-05-09 12:51:28 +01:00
gtully 9fc2661049 validate selector aware vt can give topic semantics by dropping messages when there is no consumer. Do selector cache plugin once to avoid adaptor check on each dispatch 2016-05-06 17:12:15 +01:00
gtully 1de7e7e8a3 tackle ci intermittent failure - think with prefetch extension it is not guarenteed that second consumer will get a dispatch 2016-05-06 13:54:12 +01:00
gtully fc9ad9f023 tackle intermittent ci failure, think possibe all messages are dispatched before pause 2016-05-06 12:17:07 +01:00
gtully 9a35c3731b fix ci failure when less than 4% disk space 2016-05-06 12:10:26 +01:00
Quinn Stevenson 1ccd17791b AMQ-6274 - set originalDestination for composite destinations
This closes #184
2016-05-05 11:38:48 -04:00
gtully 65cef69130 https://issues.apache.org/jira/browse/AMQ-5603 - reverting default preallocatonScope to entire_journal b/c async only really works for ssd 2016-05-05 13:06:42 +01:00
Timothy Bish a28a091c55 https://issues.apache.org/jira/browse/AMQ-6264
Fire advisory for slow consumer outside the pending lock.
2016-05-04 16:32:01 -04:00
Timothy Bish d1e2b76809 https://issues.apache.org/jira/browse/AMQ-5621
Update tests to not use hard coded broker port.
2016-05-04 14:39:38 -04:00
gtully 231679d936 https://issues.apache.org/jira/browse/AMQ-5603 - don't async preallocate to keep match data file count 2016-05-04 16:15:55 +01:00
gtully ba77b9f55a https://issues.apache.org/jira/browse/AMQ-6277 - tidy up logic that determines recovery location so that we don't recovery from the end of the journal in error on normal restart. This avoids suprious recovery logging 2016-05-03 12:47:49 +01:00
gtully 4f43a21212 https://issues.apache.org/jira/browse/AMQ-5603 - one more journal in the mix for this test with async preallocation 2016-05-03 11:36:47 +01:00
gtully 62bdbb0db5 https://issues.apache.org/jira/browse/AMQ-5603 - add preallocationScope=full_journal_async that will preallocate a journal in advance or use to avoid latency jitter on journal rotation. Added none option to disable preallocation 2016-04-29 16:57:28 +01:00
Timothy Bish 3c342ffce4 Add some additional checks for valid state. 2016-04-27 14:50:43 -04:00
Christopher L. Shannon (cshannon) 297eadf746 https://issues.apache.org/jira/browse/AMQ-6267
Added two new properties for configuration to a network bridge,
advisoryPrefetchSize and advisoryAckPercentage.  By default
advisoryPrefetchSize is set to 0, which is disabled, and will use the
prefetchSize value unless otherwise set.  Also added validation to
prefetchSize to make sure it is greater than 0 as 0 is not allowed.
2016-04-27 14:11:05 +00:00
Timothy Bish 765a010d04 https://issues.apache.org/jira/browse/AMQ-5621
Add sleep back which allows the producers to wait for the bridge
formation.
2016-04-25 18:41:00 -04:00
Timothy Bish 10478c313e https://issues.apache.org/jira/browse/AMQ-5621
Update tests to not use hardcoded port for the transport connector and
remove the unneeded sleep calls with proper test setup
2016-04-20 15:16:36 -04:00
Timothy Bish 8a30026e82 Drop back to original iterations now and give some extra time on test
timeouts.
2016-04-19 12:54:18 -04:00
Timothy Bish b027e65553 https://issues.apache.org/jira/browse/AMQ-5153
https://issues.apache.org/jira/browse/AMQ-6254

Store the original subscribed destination along with the target
destination in the subscription info object to ensure that wildcard
subscriptions remain linked.
2016-04-19 09:53:58 -04:00
gtully 6541bef52d fix logger name 2016-04-18 15:05:31 +01:00
Christopher L. Shannon (cshannon) b9f9f03829 https://issues.apache.org/jira/browse/AMQ-6256
Calling beforeMarshall on messages when they async stored before the
store task is run and before consumer dispatch to prevent two threads
from trying to mutate the message state at the same time.
2016-04-15 13:01:21 +00:00
Timothy Bish 19fd084a83 https://issues.apache.org/jira/browse/AMQ-6252
Update for some added thread safety.  Adds method healthStatus that will
regenrate the status from the healthList data which is more intuitive
than the getCurrentStatus which doesn't update state and requires
periodic calls to healthList to capture current metrics.
2016-04-14 16:53:17 -04:00
gtully 530c1a8193 https://issues.apache.org/jira/browse/AMQ-6240 - tidy up test and reduce duration. reuse closeTimeout on rollback during close which is the case here 2016-04-14 12:25:11 +01:00
Timothy Bish 82330793e9 https://issues.apache.org/jira/browse/AMQ-5621
Clean up the test, use timeouts and add a few more iterations to try and
reproduce recent CI failures from this test.
2016-04-13 15:17:14 -04:00
Brian D. Johnson 7a61718e02 https://issues.apache.org/jira/browse/AMQ-6244 - reset ActiveMQBytesMessage 'compressed' flag after restoring compressed content 2016-04-13 14:19:06 +00:00
Christopher L. Shannon (cshannon) 7f86825337 NO-JIRA - Adding activemq-junit dependency to activemq-unit-tests 2016-04-13 13:21:48 +00:00
gtully 77d46dc139 https://issues.apache.org/jira/browse/AMQ-6240 use sendTimout on sync rollback on close such that a blocked connection won't block a close 2016-04-13 11:55:59 +01:00
Christopher L. Shannon (cshannon) 5ec4513ffb https://issues.apache.org/jira/browse/AMQ-5923
Adding missing assertion statements
2016-04-12 15:52:26 +00:00
Timothy Bish c1b58d3373 https://issues.apache.org/jira/browse/AMQ-6239
Refactor the iterator implementation in the PrioritizedPendingList to
not copy elements and instead use the level iterators.  Add some
additional tests.
2016-04-12 11:35:03 -04:00
Christopher L. Shannon (cshannon) 485fcafcdf https://issues.apache.org/jira/browse/AMQ-5923
Updating tests to check prioritized messages as well
2016-04-12 14:13:52 +00:00
gtully 2a8218a9a8 https://issues.apache.org/jira/browse/AMQ-6151 - retain list for redeliveries and combine for dispatch/iteration such that redeliveries retain per priority order after prefetch 2016-04-06 15:09:36 +01:00
gtully a3a8c1c525 https://issues.apache.org/jira/browse/AMQ-6215 - support 0 maxBrowsePageSize and maxExpirePageSize such that lazyDispatch ensures highest priority messages is available to a pull consumer 2016-04-05 13:23:06 +01:00
Timothy Bish 0fb24cc4c1 Allow some extra time on the consumer wait to account for slow CI boxes 2016-03-30 14:23:33 -04:00
Christopher L. Shannon (cshannon) 75990ef14a https://issues.apache.org/jira/browse/AMQ-6222
Moving clearedMarshalledState execution to the async listener on an
async add to the message store.  This is necessary to make sure this
logic doens't execute until after the message is marshalled for the
store.
2016-03-22 17:54:13 +00:00
Timothy Bish a9521dcebf https://issues.apache.org/jira/browse/AMQ-6203
Expose configuration on the persistence adapter level.
Double the test timeout and increase the compaction frequency to account
for very slow CI boxes.
2016-03-15 12:02:40 -04:00
Timothy Bish 946e62d702 https://issues.apache.org/jira/browse/AMQ-6203
Rewrite older acks that can be preventing GC of log files.
2016-03-14 11:04:57 -04:00
gtully ae441cbc7d https://issues.apache.org/jira/browse/AMQ-6208 - fix and test 2016-03-11 12:01:18 +00:00
gtully 521c4fd8c3 extend timeout - running too close to the limit for comfort 2016-03-09 22:13:46 +00:00
Christopher L. Shannon (cshannon) a2781e3966 https://issues.apache.org/jira/browse/AMQ-6204
Fixing the removal logic on virtual destination remove inside of
Advisory Broker to clean up virtual destination maps properly.  Added a
test to verify.  Also added new debug logging to help track down any
future issues.
2016-03-09 19:54:08 +00:00
gtully 078f39f589 https://issues.apache.org/jira/browse/AMQ-6199 - apply CursorMemoryHighWaterMark to topic subscriptions 2016-03-08 16:45:06 +00:00
gtully e313f40989 https://issues.apache.org/jira/browse/AMQ-6175 - fix unit test regression SelectiveMBeanRegistrationTest 2016-03-08 11:55:46 +00:00
gtully 13ec994939 Revert "https://issues.apache.org/jira/browse/AMQ-4495 - revisit. Reinstate check for space on pagein, so that highWaterMark is respected and full state is not reached, hense pfc is not triggered in error"
This reverts commit d8cf54b0a9.
2016-03-07 16:26:25 +00:00
Christopher L. Shannon (cshannon) 903dec615c https://issues.apache.org/jira/browse/AMQ-6194
Fixing an issue that caused statistics for a transactional temporary
queue to be updated twice by mistake.  Moved the statistics update into
tryOrderedCursorAdd so that the update is called immediately only if
not inside a transaction.
2016-03-07 14:15:35 +00:00
gtully d8cf54b0a9 https://issues.apache.org/jira/browse/AMQ-4495 - revisit. Reinstate check for space on pagein, so that highWaterMark is respected and full state is not reached, hense pfc is not triggered in error 2016-03-01 11:44:41 +00:00
Brian D. Johnson 552c0f0f7a https://issues.apache.org/jira/browse/AMQ-6188 - reset BaseDestination.lastActiveTime each time a message is delivered to the broker. 2016-02-26 20:46:32 +00:00
Timothy Bish c2ad0c3251 AMQ-6183 Add isDispatchSync to the subscription view and deprecate the
meaningless one in the producer view
2016-02-24 17:25:01 -05:00
gtully fd76088814 https://issues.apache.org/jira/browse/AMQ-5875 - additional test that shows durable sub registration does not error out with this fix 2016-02-17 14:09:05 +00:00
gtully b0c0441d09 https://issues.apache.org/jira/browse/AMQ-6171 - fix vm transport replacement of : from brokerName in error, fix networkConnector retry logic in the event of localTransport creation failure 2016-02-15 14:14:19 +00:00
Timothy Bish 386210fafe https://issues.apache.org/jira/browse/AMQ-6159
Ensure proper repeat counts are scheduled.
2016-02-04 17:16:58 -05:00
Christopher L. Shannon (cshannon) 25ff5699f1 https://issues.apache.org/jira/browse/AMQ-6158
Computing messageSize for a durable subscription in KahaDB now runs much
faster (n vs n^2) which is noticable when there are a large number of
pending messages for a durable subscription.
2016-02-04 15:17:49 +00:00
gtully c17b7fdc7f add trace level log to shared file locker keepAlive 2016-02-04 13:28:59 +00:00
Timothy Bish 8c4b5f485d https://issues.apache.org/jira/browse/AMQ-6152
Ensure that when add / remove commands are colocated they don't prevent
the log from being GC'd once it is unreferenced.
2016-02-02 20:28:24 -05:00
Christopher L. Shannon (cshannon) 5f7a81f928 https://issues.apache.org/jira/browse/AMQ-6142
Fixing a race condition that exists in the decompress method of
ActiveMQBytesMessage that can cause an invalid length to be read.
2016-02-01 17:27:19 +00:00
gtully 5af5b59d3b https://issues.apache.org/jira/browse/AMQ-6151 - respect prioritizeMessages for pending and redelivered messages 2016-02-01 12:19:49 +00:00
gtully acbe31fcb5 https://issues.apache.org/jira/browse/AMQ-6137 - deal with 'special' escape chars in like selector expression 2016-01-22 15:30:16 +00:00
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual
release version.
2016-01-20 12:40:20 -05:00