Commit Graph

756 Commits

Author SHA1 Message Date
Timothy Bish 37b5dbf0ea Add some additional checks for valid state.
(cherry picked from commit 3c342ffce4)
2016-04-28 11:56:52 +00:00
Christopher L. Shannon (cshannon) d38c5906f6 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.

(cherry picked from commit 297eadf746)
2016-04-28 11:48:53 +00:00
Christopher L. Shannon (cshannon) 4c109cf273 Revert "[maven-release-plugin] prepare release activemq-5.13.3"
This reverts commit c49ab9fb51.
2016-04-28 11:47:44 +00:00
Christopher L. Shannon (cshannon) 2e9c35bf26 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit ff2241d795.
2016-04-28 11:47:32 +00:00
gtully e633e49aff https://issues.apache.org/jira/browse/AMQ-6175 - fix unit test regression SelectiveMBeanRegistrationTest
(cherry picked from commit e313f40989)
2016-04-27 11:40:20 +00:00
Christopher L. Shannon (cshannon) ff2241d795 [maven-release-plugin] prepare for next development iteration 2016-04-26 13:32:03 +00:00
Christopher L. Shannon (cshannon) c49ab9fb51 [maven-release-plugin] prepare release activemq-5.13.3 2016-04-26 13:31:15 +00:00
Timothy Bish ad07ee4612 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.
(cherry picked from commit b027e65553)
2016-04-19 09:54:46 -04:00
Christopher L. Shannon (cshannon) dc3c5a719b 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.

(cherry picked from commit b9f9f03829)
2016-04-15 13:06:51 +00:00
Timothy Bish cb6c7fb423 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.
(cherry picked from commit 19fd084a83)
2016-04-14 16:53:51 -04:00
Brian D. Johnson 7894d8a9a1 https://issues.apache.org/jira/browse/AMQ-6244 - reset ActiveMQBytesMessage 'compressed' flag after restoring compressed content
(cherry picked from commit 7a61718e02)
2016-04-13 15:22:32 +00:00
Christopher L. Shannon (cshannon) 3e2bd6d2a6 NO-JIRA - Adding activemq-junit dependency to activemq-unit-tests 2016-04-13 13:22:31 +00:00
Timothy Bish 72eecbe260 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.
(cherry picked from commit a9521dcebf)
2016-04-12 12:34:27 +00:00
gtully 6c79298541 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
(cherry picked from commit 2a8218a9a8)
2016-04-06 11:20:21 -04:00
gtully 06972183f9 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
(cherry picked from commit a3a8c1c525)
2016-04-06 11:20:07 -04:00
Christopher L. Shannon (cshannon) 7f5c09f2d7 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.

(cherry picked from commit 75990ef14a)
2016-03-22 18:55:57 +00:00
Christopher L. Shannon (cshannon) 442fadac87 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.

(cherry picked from commit a2781e3966)
2016-03-09 19:57:00 +00:00
Christopher L. Shannon (cshannon) 369a430538 [maven-release-plugin] prepare for next development iteration 2016-03-01 16:39:41 +00:00
Christopher L. Shannon (cshannon) 6a2e71f11c [maven-release-plugin] prepare release activemq-5.13.2 2016-03-01 16:39:02 +00:00
Brian D. Johnson 5dfd8cdfa8 https://issues.apache.org/jira/browse/AMQ-6188 - reset BaseDestination.lastActiveTime each time a message is delivered to the broker.
(cherry picked from commit 552c0f0f7a)
2016-02-26 21:03:19 +00:00
Timothy Bish 4782feb6a1 https://issues.apache.org/jira/browse/AMQ-6159
Ensure proper repeat counts are scheduled.
(cherry picked from commit 386210fafe)
2016-02-04 17:17:41 -05:00
Christopher L. Shannon (cshannon) 23e9ecaec1 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.

(cherry picked from commit 25ff5699f1)
2016-02-04 15:23:29 +00:00
Timothy Bish 04b191ceb4 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.
(cherry picked from commit 8c4b5f485d)
2016-02-02 20:29:57 -05:00
Christopher L. Shannon (cshannon) 86e51d2461 [maven-release-plugin] prepare for next development iteration 2016-02-02 17:11:44 +00:00
Christopher L. Shannon (cshannon) d60b73402c [maven-release-plugin] prepare release activemq-5.13.1 2016-02-02 17:11:03 +00:00
gtully ce604fba78 https://issues.apache.org/jira/browse/AMQ-6151 - respect prioritizeMessages for pending and redelivered messages
(cherry picked from commit 5af5b59d3b)
2016-02-02 16:20:22 +00:00
Christopher L. Shannon (cshannon) aaa2fdd541 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.

(cherry picked from commit 5f7a81f928)
2016-02-01 17:37:32 +00:00
Christopher L. Shannon (cshannon) adc3ba49c2 https://issues.apache.org/jira/browse/AMQ-6133
Fixing the processing of KahaUpdateMessageCommand to add the message to
the store if it doesn't exist, instead of ignoring it.  This will
prevent message loss in certain cases when the KahaDB index has to be
rebuilt.

(cherry picked from commit b4aa53d806)
2016-01-20 17:01:11 +00:00
Timothy Bish 7d3a71a4df https://issues.apache.org/jira/browse/AMQ-6131
Fix check for durable sub with no pending messages during checkpoint
cleanup.
(cherry picked from commit 193f6be687)
2016-01-18 17:45:05 -05:00
Christopher L. Shannon (cshannon) 6abb5b9bee https://issues.apache.org/jira/browse/AMQ-6129
Fixing DynamicallyIncludedDestinationsDuplexNetworkTest

(cherry picked from commit 1ae29382e1)
2016-01-18 15:29:34 +00:00
Christopher L. Shannon (cshannon) 087e5da254 https://issues.apache.org/jira/browse/AMQ-6129
Adding NetworkBridgeStatistics and also a received count for bridges
when they are in duplex mode.

(cherry picked from commit 10c998b0bc)
2016-01-15 14:58:30 +00:00
gtully 741ee01e11 https://issues.apache.org/jira/browse/AMQ-6124 - fix and test - propagate broker info from prestarted backup transport
(cherry picked from commit db1506a592)
2016-01-14 15:57:55 +00:00
Altaflux aa8b64420b Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations
(cherry picked from commit 6b1e87410d)
2016-01-14 15:57:41 +00:00
Timothy Bish b32be1bb11 https://issues.apache.org/jira/browse/AMQ-6125
Ensure that the redelivery policy is never null in the consumer.
(cherry picked from commit 9287055338)
2016-01-13 18:09:54 -05:00
Timothy Bish b04cfeb8af https://issues.apache.org/jira/browse/AMQ-6059
Ensure that a message sent to the store for the DLQ is rewritten so that
its updated values are written to prevent exirpation loops and loss of
reollback cause etc.
(cherry picked from commit 505a76a8bb)
2016-01-12 12:00:41 -05:00
Timothy Bish b4405bed5e AMQ-6121
AMQ-6122

Prevent messages on DLQ for looping back onto the same DLQ.  Prevents
expired messages from bouncing back and duplicate messages from the
store from causing a deadlock.
(cherry picked from commit 66cfc7bab3)
2016-01-12 12:00:26 -05:00
gtully 26665fa1b9 https://issues.apache.org/jira/browse/AMQ-6094 - regression via https://issues.apache.org/jira/browse/AMQ-6014 - incorrect ref count on message expiry event during cursor move for dispatch. Fix and test - thanks for the test
(cherry picked from commit e3df09b9db)
2016-01-05 14:33:43 +00:00
Christopher L. Shannon (cshannon) b103932ccd https://issues.apache.org/jira/browse/AMQ-6097
remove un-needed import statements

(cherry picked from commit 370b181099)
2015-12-22 13:14:44 +00:00
Christopher L. Shannon (cshannon) 51aa70eaae https://issues.apache.org/jira/browse/AMQ-6097
Fixing KahaDB so that the correct marshaller is used for the message
keys inside of the message order index.  This will ensure that message
size metrics are accurate.

(cherry picked from commit 246ccb8e04)
2015-12-22 13:14:44 +00:00
Timothy Bish 871f0a6005 https://issues.apache.org/jira/browse/AMQ-6102
Call to the statistics instance of the subscription to reset the
counters.
(cherry picked from commit 564d55023e)
2015-12-21 17:04:47 -05:00
gtully fc4120e850 https://issues.apache.org/jira/browse/AMQ-6086 - test cannot validate all start failures scenarios at this time, suffice that start and stop complete ok
(cherry picked from commit b7787bf6fb)
2015-12-14 19:09:15 +00:00
gtully b4360c6e0e https://issues.apache.org/jira/browse/AMQ-6086 - avoid logging npe on attempted start of persistence adapter post stop
(cherry picked from commit 455a628305)
2015-12-14 19:09:15 +00:00
gtully 2ffd7498a8 https://issues.apache.org/jira/browse/AMQ-6086 - start exception can prevent stop from exiting fully, need to be more selective in creation on stop.
(cherry picked from commit 35df815fb8)
2015-12-14 19:09:15 +00:00
gtully e5b86116c4 https://issues.apache.org/jira/browse/AMQ-6086 - add some determinism to interleaved stop and start calls on broker service
(cherry picked from commit da076f4a63)
2015-12-11 17:32:06 +00:00
gtully 724a0e85f3 https://issues.apache.org/jira/browse/AMQ-6083 - ignore test scenario on leveldb store
(cherry picked from commit 8609f74db3)
2015-12-11 12:34:36 +00:00
gtully 9e8f020301 https://issues.apache.org/jira/browse/AMQ-6005 - have plist whack it existing state on start. Start the temp store after the primary persistence adapter which does the locking
(cherry picked from commit 768fa17085)
2015-12-10 09:46:17 -05:00
gtully 2be754583c https://issues.apache.org/jira/browse/AMQ-6084 - add broker.adjustUsageLimits to disable the adjustment of limits to what is available. In this way, a broker will fail to start if constrained, ensuring it won't accept connections and block pending resources if it has earlier exited for that reason
(cherry picked from commit d7febddb67)
2015-12-10 09:46:03 -05:00
gtully 99fce5bae9 https://issues.apache.org/jira/browse/AMQ-6083 - ignoreMissingJournalfiles false - check for missing acks and corruption anywhere and error out so that corruption does not go unnoticed - fix and test
(cherry picked from commit 5db5f3e39a)
2015-12-09 09:20:48 -05:00
gtully 558dcc0479 https://issues.apache.org/jira/browse/AMQ-6070 - rework for virtual topic case, use the destination from the transient region destination rather than the message, such that consumer queue advisories work for delivered etc
(cherry picked from commit 179dc3acb2)
2015-12-08 09:51:23 -05:00
Timothy Bish 6e2252d083 https://issues.apache.org/jira/browse/AMQ-6074
Make the transportConnector configs consistent across all four variants
by removing the enableCipherSuites option on openwire NIO+SSL.  RC4 was
enabled on the broker side but in later JDK releases that suite is
disbaled as it is insecure so the client side couldn't find a supported
suite.
(cherry picked from commit 315147c5ef)
2015-12-07 12:28:54 -05:00