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)
Don't log the pull timed out messages that might still be in the
unconsumed list during rollback of unconsumed messages
(cherry picked from commit aaecdff8b485dc1baf84110375d4b9ffa6f68c19)
Adding a flag to enable or disable Ack Compaction
Currently defaults to enabled for 5.14.0 and above
(cherry picked from commit cbad8babe507f63cc80e42fe37070b898d4d8dbc)
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 a9521dcebfb4e469dde7465ff95d8e8f1f050abd)
Moving the bytes copy to the parent Message class to solve this this
issue for all message types as that is the root cause
(cherry picked from commit e69c2cbad6611fa355bd9eb592f03bd3b8f90abb)
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)
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)
Synchronizing ActiveMQText message on state changes for the content and
text fields so that they are always changed together. This will prevent
race conditions where data can be lost when using concurrent store and
dispatch.
(cherry picked from commit e0c549996479c2a1ccf70029ad4462cb987650f6)
Fixing copy method of ActiveMQTextMessage to prevent a race condition
when concurrent store and dispatch is used with Queues
We may need explicity synchronization between the text and content fields
in the future if other issues pop up
(cherry picked from commit ea09159a4087212964787e7cf68ef30170d115f0)
Fixing ReloadableProperties so that the groups file will be properly
reloaded on file modification. Added a test to verify.
Thanks to Nanchang Yang for providing the fix.
(cherry picked from commit 2788bd55845d35ffb753f20ea1fee9711e85fe43)
Update the threads created by the SelectorManager to be daemon threads.
(cherry picked from commit e2b4ca2c59a316be91cf391c758a10e518dd3a1f)
Conflicts:
activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorManager.java
Adding spring-messaging to the artifactSet for activemq-all to be
included inside the shaded jar
(cherry picked from commit 4bd9a4ef6f29399ebde61275db75cf8d5d323ffc)
Perform writes / sync in predicatable order first to the recovery file
and then into the main index file.
(cherry picked from commit b39ab7867c208a967090eff189594c2b06dafb34)
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)
Upgrading Saxon version to fix xpath filter errors when using Camel
Thanks to Jamie Goodyear for the patch
(cherry picked from commit d89826bdab820bd399180c3c150cef9d82af3565)
Reworking patch so that the http trace method is also turned off by
default for the HttpTransport, besides just for the Websocket transport.
Also added SSL tests for both transports.
(cherry picked from commit 473b3284d42613b117bd5103d59435ab46f0c420)
Disabling the HTTP trace method on the websocket port by default. It
can be enabled by setting the parameter "http.enableTrace=true" on the
connection uri if it is needed for debugging.
(cherry picked from commit 4fb808397759b5569f8e8b49a486026aeaeecac2)
Create a proper SSLContext for the MQTT client provider in the tests to
avoid failure on newer JDKs
(cherry picked from commit 6e2edf08c3e3dda7656dffa1af8c92b6ed333c22)
Fixing CronParserTest so that it checks 24 hour format properly when
using a timezone shifted by 30 minutes
Thanks to Jamie Goodyear for the patch
(cherry picked from commit 0f445a535f8ec1135d6769a9e7c1503fd7b26121)
Fixing X-Frame-Options header so that is applied for all content served
by Jetty. The previous patch wasn't correct because it only applied it
to Servlets and JSPs and not static content. This also reverts AMQ-6113
(cherry picked from commit 24ad36778534c5ac888f880837075449169578ad)
Only setting the socketBufferSize in TcpTransport if the value is
greater than 0 as other values are illegal.
(cherry picked from commit 90726a60afffa0bff6db74b15340152ebe1d5082)
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 25ff5699f1fb7c73668d5da2eacb53ad2ef14289)
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 8c4b5f485d64caec97b0abe2b721d47bc19bfba1)
