Commit Graph

761 Commits

Author SHA1 Message Date
Dejan Bosanac a73eb0eab5 https://issues.apache.org/jira/browse/AMQ-6435 - align jackson version used, with the rest of the project 2016-11-30 11:44:13 +01:00
Claus Ibsen 78492febc8 AMQ-5659: Add safety measure against infinite loop when store exception prevents message removal. Thanks to metatechbe for the patch. This fixes #72. 2016-11-29 18:58:17 +01:00
gtully cfdff4edc5 [AMQ-6518] - fix up aveMessageSize dest stat and test 2016-11-25 10:38:09 +00:00
gtully 7077d2b910 [AMQ-3166] init rollbackonly exception cause such that xaexception has meaning, thanks to james (jtahlborn) for the suggestion 2016-11-22 16:07:55 +00:00
Timothy Bish 2c828b23df https://issues.apache.org/jira/browse/AMQ-6504
Fix intermittent test failure
2016-11-21 12:37:52 -05:00
Timothy Bish e050519ff6 https://issues.apache.org/jira/browse/AMQ-6500
Better handle prefetch extension and pull consumers over Topics to avoid
the remote not receiving all the messages available based on the credit
it has issued.
2016-11-18 11:59:01 -05:00
gtully 2537266740 [AMQ-4082] - ensure masked exception is report in the log on missing broker info from local or remote transports 2016-11-15 13:23:54 +00:00
Christopher L. Shannon (cshannon) 7e648d512d https://issues.apache.org/jira/browse/AMQ-6505
Fixing the auto transport protocol detection so that the byte buffer
that captures the initial bytes for detection is not shared across
threads. This was causing failed connections under high load and high cpu
usage under NIO
2016-11-12 10:02:32 -05:00
Timothy Bish 980162233f https://issues.apache.org/jira/browse/AMQ-6504
Round the start time value not truncate to ensure delay falls on the
correct side of the scheduling block.
2016-11-11 14:48:49 -05:00
Hadrian Zbarcea 5076808b57 AMQ-6497 Add method to navigate interceptors 2016-11-04 17:18:49 -04:00
Hadrian Zbarcea dce2b61f87 AMQ-6494 Return ExceptionResponse during broker service shutdown 2016-11-04 09:30:09 -04:00
Hadrian Zbarcea be24a133ef This closes #88 (merged as a65ac586). More file permissions fixes. 2016-11-03 14:26:34 -04:00
Hadrian Zbarcea d5a929c0d2 This closes #205. Won't fix. (fix even more file permissions) 2016-11-03 14:11:40 -04:00
Hadrian Zbarcea d54d046b8a This closes #185. Won't fix. (fix more file permissions) 2016-11-03 11:54:33 -04:00
Christopher L. Shannon (cshannon) 7c3bb40100 https://issues.apache.org/jira/browse/AMQ-6477
ReduceMemoryFootprint now applies to non-persistent messages if they
have been marshalled and topics now clear memory after the recovery
policy check
2016-10-25 10:19:03 -04:00
Christopher L. Shannon (cshannon) b9cb02ae54 https://issues.apache.org/jira/browse/AMQ-6476
Moving BrokerSubscriptionInfo processing into a new thread to prevent a
deadlock of the network bridge on startup
2016-10-24 07:52:09 -04:00
Christopher L. Shannon (cshannon) d206621a73 https://issues.apache.org/jira/browse/AMQ-6472
Durable sync over a network bridge will now also sync non-durable
subscriptions proplrly if the consumer belongs to a destination that is
configured to force network durable subscriptions.
2016-10-20 13:47:38 -04:00
Christopher L. Shannon (cshannon) 406a34294b https://issues.apache.org/jira/browse/AMQ-6465
Properly decrementing the message reference count in
DemandForwardingBridgeSupport when messages supression is checked for
durable subscriptions
2016-10-14 12:16:07 -04:00
gtully 74a5381b9a AMQ-6463 - provide connection to scheduler context in case of deferred send or error 2016-10-11 11:58:37 +01:00
gtully 8493f6b4d7 AMQ-6459 - store based % usage needs to poll the store for the current value on each access 2016-10-07 14:31:52 +01:00
gtully b6759b33dc AMQ-6403 - init broker temp from provided temp store to align usage checks. Thanks for the patchh shailendra14k@gmail.com, made a mod to respect broker.tmpDataDirectory as a default. This closes #204 2016-10-06 11:47:55 +01:00
Christopher L. Shannon (cshannon) 72650a0b8b https://issues.apache.org/jira/browse/AMQ-6449
Disabling doclint now only activates for JDK 8
2016-10-03 07:37:53 -04:00
Christopher L. Shannon (cshannon) 02082b1aec NO-JIRA: More Java 8 JavaDoc fixes - also fixed findbugs for Java 8 2016-09-30 14:36:44 -04:00
gtully 5385fd1bb3 https://issues.apache.org/jira/browse/AMQ-6446 - use shared logger and pepend statements with connection counter. Old behaviour or per connection logger can be obtained with trace=true&jmxPort=0 2016-09-30 14:05:42 +01:00
Dejan Bosanac e8ba0b0119 https://issues.apache.org/jira/browse/AMQ-6435 - destination mbean query api, return the right count 2016-09-27 12:53:49 +02:00
Christopher L. Shannon (cshannon) a82c95cd29 https://issues.apache.org/jira/browse/AMQ-6436
The temporary store will now delete the old temp directory on start up
if lazyInit is true instead of waiting for the store to initialize to
clear up space.  This prevents space on the disk from being wasted with
old data if the temp store isn't initialized
2016-09-23 15:47:27 -04:00
Christopher L. Shannon (cshannon) 18571ce09b https://issues.apache.org/jira/browse/AMQ-6430
Modifying patch so that only stores that persist the noLocal flag will
check if this flag has changed to prevent a subscription from being
deleted by mistake
2016-09-23 10:59:32 -04:00
Christopher L. Shannon (cshannon) 7c293b661f https://issues.apache.org/jira/browse/AMQ-6430
When a nolocal durable consumer reconnects the new connectionId is properly captured for
the NoLocal expression so that nolocal works on reconnect.  Also fixed
the detection of the nolocal value changing on consumer connect.
2016-09-21 09:34:46 -04:00
gtully ffee8b442f https://issues.apache.org/jira/browse/AMQ-6422 - match proton sender view credit to prefetchExtension - tracking credit to dispatch delta to track additional flow requests. Proton sender layer is distinct from the transport layer - they mirror each other 2016-09-21 10:33:20 +01:00
Dejan Bosanac 6630e81379 https://issues.apache.org/jira/browse/AMQ-6435 - destination mbean query api 2016-09-19 16:22:44 +02:00
Christopher L. Shannon (cshannon) a038655605 https://issues.apache.org/jira/browse/AMQ-6423
Fixing durable sync over a network bridge so that network subscriptions
that are no longer permissible are also cleaned up
2016-09-08 08:28:26 -04:00
gtully 88daeec28f AMQ-6422 - include the inflight count in the prefetch for positive remote credit flows. Fix and test 2016-09-07 17:28:35 +01:00
Christopher L. Shannon (cshannon) 88af1c70d9 https://issues.apache.org/jira/browse/AMQ-6418
Fixing mqtt link stealing default setting for auto transport
2016-09-07 08:17:34 -04:00
Christopher L. Shannon (cshannon) 9ab94883a8 https://issues.apache.org/jira/browse/AMQ-6420
Properly copying wire format options map before applying to the
transport when using auto transports so that the options do not get
cleared and will be used for all future connections
2016-09-07 07:42:13 -04:00
Christopher L. Shannon (cshannon) 98c5866c75 https://issues.apache.org/jira/browse/AMQ-6418
Properly setting the transport properties on the
AutoNIOSSLTransportServer and fixing the Stomp protocol to set the peer
certs when using auto+ssl
2016-09-06 10:17:05 -04:00
Timothy Bish bb8d32c04a https://issues.apache.org/jira/browse/AMQ-6387
Fix up the Memory Store such that it removes the references it adds to
messages when they are placed into the memory durable topic subscription
store.
2016-09-01 16:26:03 -04:00
Christopher L. Shannon (cshannon) ed0e786b60 https://issues.apache.org/jira/browse/AMQ-6414
Changing the nio+ssl transports to trigger a serviceRead after start up
to prevent blocking. The prevents the channels from not reading in
certain cases, most notably with the auto+nio+ssl transport when used
for a network bridge.  Also added a couple tests and changed a network
bridge test to test out auto+nio+ssl.
2016-09-01 11:39:46 -04:00
gtully 2b1cda1964 AMQ-6406 - ensure duplicates trapped by the cursor-add or queue-page-in are removed from the message store 2016-08-25 15:01:19 +01:00
gtully 5a874816b7 AMQ-6403 - add indexDirectory attribute to kahadb plist impl - settable via broker service tempDataStore 2016-08-24 11:39:22 +01:00
gtully 6d44ae6e97 AMQ-5815 - remove obsolete remnant of fix for AMQ-2594. holding global lock before attempting to get index and checkpoint lock can lead to deadlock if checkpoint write lock request pops in 2016-08-15 11:37:38 +01:00
gtully 4800a7a1a4 AMQ-6392 - allow mapping of host names via the publish address strategy 2016-08-09 15:22:28 +01:00
gtully 9249315688 AMQ-6389 - init the size attribute prior to logging a message send in the logging plugin 2016-08-08 16:46:49 +01:00
Christopher L. Shannon (cshannon) 06a21dbbb3 [maven-release-plugin] prepare for next development iteration 2016-08-02 09:03:37 -04:00
Christopher L. Shannon (cshannon) 71cbc65283 [maven-release-plugin] prepare release activemq-5.14.0 2016-08-02 09:02:54 -04:00
Christopher L. Shannon (cshannon) e73ab34837 https://issues.apache.org/jira/browse/AMQ-6383
https://issues.apache.org/jira/browse/AMQ-6373

Adding a new flag that can be specified on a network bridge to allow
forcing of subscriptions to be durable.  Cleaned up some unit tests.
2016-08-01 10:02:56 -04:00
Christopher L. Shannon (cshannon) 82295fd2c6 https://issues.apache.org/jira/browse/AMQ-6381
Fixing DurableTopicSubscription so that an ack will properly update the
forwards statistic on an ack
2016-07-29 15:56:52 -04:00
Christopher L. Shannon (cshannon) cf3d419528 https://issues.apache.org/jira/browse/AMQ-6375
Adding non-blocking metrics to KahaDB to track message counts and sizes
for subscriptions.  Turned off by default but can be enabled on the
KahaDBPersistenceAdapter
2016-07-26 12:02:44 -04:00
gtully 01cfa7727d AMQ-6361 - fix additional test regression on topic sub expiry AMQ4083Test,MessageEvictionTest 2016-07-26 13:45:41 +01:00
Christopher L. Shannon (cshannon) 3953b9aaef https://issues.apache.org/jira/browse/AMQ-6373
Adding a new OpenWire command called BrokerSubscriptionInfo in order to
help synchronize durable subs across a network bridge.  Added OpenWire
version 12.  For dynamicallyIncludedDestination durable subs will now be
synchronized on a bridge reconnect as long as the bridge supports
conduitSubscriptions and dynamicOnly=false
2016-07-25 11:56:13 -04:00
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
Christopher L. Shannon (cshannon) 9f7d70ba0d https://issues.apache.org/jira/browse/AMQ-6366
Need to make sure that the durableDestinations set on the duplex bridge
are only topics
2016-07-20 08:33:45 -04:00
Timothy Bish e05db7cb5c https://issues.apache.org/jira/browse/AMQ-6273
increment the connect attempt count explicitly to ensure reconnect
policy options are applied.
2016-07-19 17:26:24 -04: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 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) 42dabb7a7a https://issues.apache.org/jira/browse/AMQ-6357
Preventing a divide by 0 error by taking a local reference to the
prefetch size to guarantee that the value doesn't change after the > 0
check
2016-07-14 10:07:02 -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
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
Timothy Bish 4e23adfcc9 https://issues.apache.org/jira/browse/AMQ-6340
combine the lists in the correct order for later redispatch.
2016-06-29 12:57:30 -04:00
Christopher L. Shannon (cshannon) 6be36305f6 https://issues.apache.org/jira/browse/AMQ-6337
Checking for the correct number of arguments before reflectively
invoking a method in DefaultAuthorizationMap
2016-06-23 20:34:50 +00:00
Timothy Bish 03785a4d53 https://issues.apache.org/jira/browse/AMQ-6334
Fix error handling for connection establishment on the bridge.
2016-06-23 11:03:06 -04: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
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
Dejan Bosanac 9f9b0fb26a https://issues.apache.org/jira/browse/AMQ-6322 - Introduce timeout in network bridge for waiting broker infos 2016-06-14 14:29:11 +02: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 98d2000833 https://issues.apache.org/jira/browse/AMQ-6275
Avoid unnecessary connection state lookup leading to lock ordering
issues.
2016-06-09 12:10:09 -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 1f9b139f59 test for uuid temp request/reply from camel across network 2016-06-02 16:58:03 +01:00
gtully 29b833fe8e fix shadowing and ensure close of connection, ci... 2016-05-26 11:30:32 +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 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
Timothy Bish 0883011147 Fix data dir path change that shouldn't have been committed with the
other fixes.
2016-05-18 11:02:14 -04: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 2c3046b816 Fix test timing out on slow spinning disks.
On a local drive with heave I/O this test took over 2.5 minutes to
complete, CI machines can see similar times, bumped timeout to 5 minutes
to account for this range.
2016-05-17 13:00:56 -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
Timothy Bish b9334960e0 Add some additional time to the wait for completion assert. On a
sufficiently loaded system 30s is not quite enough.  This is
reproducable if run while a heavily I/O based application is also
running in the background.
2016-05-13 12:50:13 -04:00
Christopher L. Shannon (cshannon) d3ea5c4f9f https://issues.apache.org/jira/browse/AMQ-5621
Fixing LinkStealingTest by adding a wait because removeConnection
may not have been called yet when checking if the removeException
exists the first time
2016-05-10 11:44:17 +00: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
Timothy Bish 6cf8bed0c5 https://issues.apache.org/jira/browse/AMQ-5621
Update test with additional checks and logging to try and see what is
happening when it is failing in CI.
2016-05-09 16:57:39 -04: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
Timothy Bish 5009b0c03b https://issues.apache.org/jira/browse/AMQ-6247
Allow the provider position to be read from the system.
2016-05-06 09:37:51 -04:00
Timothy Bish 5096463b00 https://issues.apache.org/jira/browse/AMQ-6281
Deprecate the copyMessage option and remove usage, always copy a
forwarded message.
2016-05-05 12:59:29 -04:00
Quinn Stevenson 1ccd17791b AMQ-6274 - set originalDestination for composite destinations
This closes #184
2016-05-05 11:38:48 -04: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
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 8031d77f98 https://issues.apache.org/jira/browse/AMQ-6251
Make field volatile since it is written to outside of any locks and read
both in and out of locking.
2016-04-26 10:04:21 -04:00
Christopher L. Shannon (cshannon) 11622b3af3 https://issues.apache.org/jira/browse/AMQ-6256
Moving beforeMarshall back to the store implementations because we don't
want all store implementations to marshall (such as memory store)

This reverts commit b9b98a45ce.
2016-04-18 12:34:25 +00:00
Christopher L. Shannon (cshannon) 9c8bd3360f https://issues.apache.org/jira/browse/AMQ-6222
Reverting the change to move clearMarshalledState into the callback
listener as beforeMarshall is now called before the async message add

Revert 75990ef14a
2016-04-18 11:49:16 +00:00
Christopher L. Shannon (cshannon) b9b98a45ce https://issues.apache.org/jira/browse/AMQ-6256
Moving beforeMarshall call out of the store and into the actual
destination
2016-04-15 14:17:00 +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
Timothy Bish f9682b802f https://issues.apache.org/jira/browse/AMQ-6127
LOG at info level for when broker is being stopped and a new connection
is not being accepted.
2016-04-12 16:28:23 -04: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
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
Christopher L. Shannon (cshannon) b2327db3b7 https://issues.apache.org/jira/browse/AMQ-6133
Disabling async queue message store when persistJMSRedelivered is turned
on for a destination.  That flag will cause a sync update later on
dispatch which can cause a race condition if the original message add is
processed after the update.  This can cause a duplicate message to be
stored.
2016-04-01 16:40:45 +00:00
Timothy Bish 48ba714b30 https://issues.apache.org/jira/browse/AMQ-6210
Clean up and apply filtering for temp destinations to removeConsumer as
well.  

This closes #175
2016-03-28 14:40:00 -04:00
Timothy Bish f3ecc293f0 https://issues.apache.org/jira/browse/AMQ-6210
Don't cache selectors for temp destinations.
2016-03-28 14:34:20 -04:00
Timothy Bish c53b99c14d NO-JIRA Fix test such that the broker ports are selected dynamically
instead of hardcoded.
2016-03-23 10:23:10 -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
Dejan Bosanac a4c748883a https://issues.apache.org/jira/browse/AMQ-6211 - synchronize creating of jmx composite types 2016-03-14 17:10:13 +01:00