606 Commits

Author SHA1 Message Date
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
Christopher L. Shannon (cshannon)
840583df09 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 32913408a68ec92e3d202f5dcc3923d5c7d7588a.
2016-04-18 12:43:28 +00:00
Christopher L. Shannon (cshannon)
9d545cf11f 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 7f5c09f2d77c77f87a47fb738870c5ee5bc78c27
2016-04-18 11:54:38 +00:00
Christopher L. Shannon (cshannon)
32913408a6 https://issues.apache.org/jira/browse/AMQ-6256
Moving beforeMarshall call out of the store and into the actual
destination

(cherry picked from commit b9b98a45cee484b112dadeffa2d9a874c4ffe280)
2016-04-15 14:22:15 +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 19fd084a83c990f9fb75a5f2becb48ac808a1b36)
2016-04-14 16:53:51 -04: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 2a8218a9a8cfa74e1049249481f601e042f33358)
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 a3a8c1c5256aa8ea1067afe3e1586832e5aa1821)
2016-04-06 11:20:07 -04:00
Christopher L. Shannon (cshannon)
8393e6b8ea 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.

(cherry picked from commit b2327db3b79dffd42fd5c6ba85720a5d9c302052)
2016-04-01 16:51:20 +00: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 75990ef14a092b629bf8d2127bc4786e51b31684)
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 a2781e3966ded41a241d24ffb8d85d410c39eb21)
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 552c0f0f7a7502c0337b13699de51a11b29723a2)
2016-02-26 21:03:19 +00:00
Jeff Genender
9224f27ba3 AMQ-6175 - Web console needs to only obtain lists of MBeans that are not suppressed. 2016-02-18 14:36:06 -07:00
Timothy Bish
4782feb6a1 https://issues.apache.org/jira/browse/AMQ-6159
Ensure proper repeat counts are scheduled.
(cherry picked from commit 386210fafe331630aded29f2af64b1ccdf161bf3)
2016-02-04 17:17:41 -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 5af5b59d3bf3c84098e55b6cb87631c061990666)
2016-02-02 16:20:22 +00:00
Marc Breslow
0b481903aa Fix Impossible Cast issues in MemoryTopicSub:
- recoverSubscription()
-- map is defined as LinkedHashMap<MessageId, Message>
-- msg is defined as <map> entry.getValue() so must be a Message
-- condition if (msg.getClass() == MessageId.class) could never be true
-- no need to cast at all when using generics

- recoverNextMessages()
-- basically same code copy/pasted so same fix

Removed 2 conditions from ServerSessionPoolImpl that would result in impossible casts. Conditions removed were trying to cast ActiveMQQueueSession and ActiveMQTopicSession to ActiveMQSession which is illegal.

Since it isn't obvious what to do if you get an ActiveMQQueueSession or ActiveMQTopicSession from getServerSession() I make it fall back to the else condition which raises an async exception. This is better than getting a ClassCastException at runtime.

Remove impossible cast in MemoryMessageStore

(cherry picked from commit 4a937def7db8d5f8229c95c05843f98de1803068)
2016-02-01 13:07:26 +00:00
Daniel Kulp
3e3cddc97e Remove a printStackTrace for an exception that is also logged. Produces noise on console 2016-01-27 10:21:32 -05:00
Christopher L. Shannon (cshannon)
24a9fa79f4 https://issues.apache.org/jira/browse/AMQ-6129
fixing typo

(cherry picked from commit 7b7e362465d05ad42b3d6a6c8211097dd2053c2a)
2016-01-15 15:13:26 +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 10c998b0bc9728276a738ed24d20c6fc82c6365a)
2016-01-15 14:58:30 +00:00
Altaflux
aa8b64420b Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations
(cherry picked from commit 6b1e87410da4a2033c286fcaa758371e48da62ec)
2016-01-14 15:57:41 +00: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 505a76a8bb7180debbd36637dce1b9101150d0b4)
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 66cfc7bab3dfa2e079bbc5276312c97ab02cae4f)
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 e3df09b9db09d6cf2834b0beb901c253be9b6120)
2016-01-05 14:33:43 +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 564d55023ec7386c31277db054ecc63d966e2b29)
2015-12-21 17:04:47 -05:00
Christopher L. Shannon (cshannon)
a12c21061e https://issues.apache.org/jira/browse/AMQ-6091
The JavaRuntimeConfigurationBroker can now apply a subset of policy
properties retrospectively to existing destinations versus applying
all properties of the policy update.

(cherry picked from commit a253ad3c71a07bb4d1883fe84be217af9855cfc6)
2015-12-18 18:22:19 +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 455a628305dc49476d7033701901d119db3fffdb)
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 35df815fb86d201e63b4f0f2d53bee3bae5c0752)
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 da076f4a632af6ad1d66382523f4c50e9de9e62e)
2015-12-11 17:32:06 +00:00
gtully
aa2a85abe5 https://issues.apache.org/jira/browse/AMQ-6070 - rework regression - KahaDBStoreRecoveryExpiryTest had NPE in the logs, region dest not set on recovery listener for expiry case
(cherry picked from commit 93092f7ea0e231cd7d615f8ee6420c9b73a5367f)
2015-12-11 17:31:32 +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 768fa17085ac938441915a82987c99b37ac52515)
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 d7febddb6789171ccfd22faf0ee4f00f3e9c9490)
2015-12-10 09:46:03 -05:00
gtully
c67590104b https://issues.apache.org/jira/browse/AMQ-5454 https://issues.apache.org/jira/browse/AMQ-6070 - in the case of duplicates from the store the regiondestination was not set
(cherry picked from commit 88ec9dad9dc47790a3fc4e0f5ad939ea5530dad7)
2015-12-08 09:51:37 -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 179dc3acb28a8a7fc3c1eddf6c6ac54fe49836a5)
2015-12-08 09:51:23 -05:00
Christopher L. Shannon (cshannon)
1ebfa9ade2 https://issues.apache.org/jira/browse/AMQ-6080
fixing typos

(cherry picked from commit 5772e7bed88198f57fabb08c2f48a1de68dea72c)
2015-12-08 13:19:31 +00:00
gtully
e1cf0d2678 https://issues.apache.org/jira/browse/AMQ-6070 - set correct originalDestination property value in advisories
(cherry picked from commit 75ff17af414b98dbdd891f66b9425692ca799fcc)
2015-12-03 09:00:27 -05:00
Christopher L. Shannon (cshannon)
819e512138 https://issues.apache.org/jira/browse/AMQ-6062
Updated QueueBrowserSubscription to use a ConcurrentMap to avoid a
potential race condition when multiple queue browsers browse
multiple queues.

(cherry picked from commit d346a765e3064a951c5d55119b80b8432a45bcb6)
2015-12-02 15:53:59 +00:00
Christopher L. Shannon (cshannon)
db87a051ca https://issues.apache.org/jira/browse/AMQ-6069
Fixed contains method in PrioritizedPendinList which was not returning
correctly.  This was causing messages to not be removed from the
dispatchPendingList when purge was called inside a Queue leading to an
eventual OOM error if enough messages were purged. This fix also
improves performance of the contains method.

(cherry picked from commit 8363c99b51a98eb176e6baea82fcafce3225ba2c)
2015-12-02 13:42:42 +00:00
Christopher L. Shannon (cshannon)
95fc593975 Update version for next patch release iteration. 2015-11-30 14:35:26 +00:00
Christopher L. Shannon (cshannon)
cfb4ca9f54 [maven-release-plugin] prepare for next development iteration 2015-11-30 13:48:58 +00:00
Christopher L. Shannon (cshannon)
abfe038ddf [maven-release-plugin] prepare release activemq-5.13.0 2015-11-30 13:48:11 +00:00
gtully
f09000d1e6 https://issues.apache.org/jira/browse/AMQ-6065 - ensure no call to exit. fix mock test to account for extra call 2015-11-30 13:24:19 +00:00
gtully
1bef4de4dc Revert "https://issues.apache.org/jira/browse/AMQ-6065"
CPL dependency is not fully compatable with ASF and is not really necessary

This reverts commit 39a20bd788c664105c18886abf77c372cf9229aa.
2015-11-30 13:24:18 +00:00
Christopher L. Shannon
39a20bd788 https://issues.apache.org/jira/browse/AMQ-6065
Fixed test case so that a System.exit call will not take down the
JVM and cause the test suite to abort in Jenkins early
2015-11-29 10:05:27 -05:00
Christopher L. Shannon
673c2928a1 https://issues.apache.org/jira/browse/AMQ-6066
Improving performance of OrderedPendingList contains method

Thanks for David Sitsky for the patch
2015-11-28 13:25:53 -05:00
gtully
2aa172f905 https://issues.apache.org/jira/browse/AMQ-6065 - allow ioexception handler to flip the systemExitOnShutdown broker attribute before calling stop, i.e: exit on store io errors 2015-11-27 14:21:20 +00:00
gtully
0a12bcb928 https://issues.apache.org/jira/browse/AMQ-2191 https://issues.apache.org/jira/browse/AMQ-3529 - rework fixes to remove uncertanty from dealing with intettuptedexception. Sync requests will trap interrupts that ocurr while waiting for responses and fail the connection with an interruptedioexception. Interrupts pending before requests will be suppressed, allowing possible clean shutdown. It is not safe to replay openwire ops b/c they are not idempotent, the only safe option is to have a teardown of the broker side state from a close 2015-11-27 12:21:56 +00:00