Commit Graph

1285 Commits

Author SHA1 Message Date
Endre Stølsvik 393a696955 AMQ-8617: RedeliveryPolicy:Exponential Backoff + NonBlockingRedelivery = too long delays
Scenario on client:

1. Employing RedeliveryPolicy with exponential backoff (keeping maximum
redeliveries at default 6)
2. Enabled non-blocking redelivery
3. Receiving e.g. 100 consecutive poison messages (which eventually
should DLQ after max redeliveries)

This will result in massive redelivery delays due to a logic bug.

The reason is that redeliveryDelay is a field variable kept on the
ActiveMQMessageConsumer, instead of being a property on the message - or
that the redelivery delay was calculated per message based on the
redelivery count.

When consecutive messages rollbacks multiple times, the redeliveryDelay
field is continuously multiplied by the backoff multiplier, resulting in
enormous delays.

Fix: Ditch the field variable, instead calculating the redeliveryDelay
per delivery from the redelivery count. (This happens to be identical to
how it is done in afterRollback() in ActiveMQSession:1004.)

Test is added - which fails with the previous code, and passes with
this. Added a debug log line for the calculated delay.
2022-05-31 01:56:30 +02:00
Jean-Baptiste Onofré ebe6992fd6 Fix log name in SharedFileLockerLoggingTest and enable runtime config module (local changed pushed by mistake) 2022-04-18 11:19:14 +02:00
Jean-Baptiste Onofré c711d5c029 Fix unit tests which fail related to log4j 2.17.2 update 2022-04-17 07:28:57 +02:00
Matt Pavlovich ddbad25ec5
[AMQ-8567] Upgrade maven-surefire-plugin to 3.0.0-M6 (#819)
- Exclude problematic unit tests for now
2022-04-08 08:37:50 -05:00
Jean-Baptiste Onofré 3f454600e6
Merge pull request #809 from jbonofre/AMQ-8561
[AMQ-8561] Add missing jetty-webapp dependency in activemq-web
2022-04-06 07:43:26 +02:00
Christopher L. Shannon b93d58259c AMQ-8550 - Check for null keystore/truststore passwords
Inside ActiveMQSslConnectionFactory the passwords should be checked for
null so a NPE isn't thrown. Null will be passed to the factories instead
and the keystore/truststore factories will try and load the keystores
using null for the password which may or may not work depending on the
implementation and if password is set.
2022-04-05 12:17:14 -04:00
Jean-Baptiste Onofré ffab5274a4 Fix OfflineDurableSubscriberTimeoutTest on some machine (including Jenkins) 2022-04-03 19:22:58 +02:00
Christopher L. Shannon (cshannon) 3d06efe93d AMQ-8530 - Update to geronimo-annotation_1.3_spec 2022-03-09 08:14:43 -05:00
Christopher L. Shannon 32e72b0879 AMQ-8528: Fix test failures in integration module
-DurableFiveBrokerNetworkBridgeTest: Fix refactoring mistake
-SpringTest: Fix Spring xml files
-BrokerRedeliveryTest: Fix after sendDuplicateFromStoreToDLQ default
changed to false
-AMQ4952Test: Fix after sendDuplicateFromStoreToDLQ default
changed to false
-AMQ3537Test: Add missing package to SERIALIZABLE_PACKAGES
-OfflineDurableSubscriberTimeoutTest: Fix after log4j2 update
-JDBCConcurrentDLQTest: Fix after log4j2 update
2022-03-08 13:29:09 -05:00
Christopher L. Shannon (cshannon) 957a2dd940 AMQ-8528: Fix JMS 2.0 related test failures 2022-03-08 11:10:16 -05:00
Christopher L. Shannon c4d9d70987
NO-JIRA: Activate quick-tests by default (#792) 2022-03-04 19:00:39 -06:00
Christopher L. Shannon (cshannon) ae30dce4e2 AMQ-8520: Log4j2 test fixes
Also fixes Log4jConfigView
2022-03-03 15:24:38 -06:00
Matt Pavlovich 7ec5254bb5 [AMQ-8520] WIP: Convert activemq-unit-tests to log4j2 2022-03-03 15:24:38 -06:00
Christopher L. Shannon (cshannon) f240cb5806 AMQ-8520: Re-enable all modules to compile and build by default
Updates the modules part of the previous full.test profile to always
build but skip running tests by default.

Also fixed miss dependency updates including log4j and jetty
2022-03-02 10:49:52 -05:00
Christopher L. Shannon (cshannon) 00253b3219 NO-JIRA: Updating next development version to 5.18.0-SNAPSHOT 2022-03-01 09:36:34 -05:00
Jean-Baptiste Onofré e597017200
Merge pull request #662 from jbonofre/AMQ-7426
[AMQ-7426] Upgrade to log4j2
2022-02-27 13:23:53 +01:00
Matt Pavlovich 094dbc89f3
[AMQ-8515] FailoverTransport should handle MaxFrameSizeExceededException (#785) 2022-02-25 19:46:45 -06:00
Matt Pavlovich 9956dd602a
[AMQ-8440] Set sendDuplicateFromStoreToDLQ to 'false' by default (#773) 2022-02-24 08:45:35 -06:00
jbonofre 472dcf8497 [AMQ-7426] Upgrade to log4j2 2022-02-24 15:20:51 +01:00
Christopher L. Shannon 856d54c7bc
Merge pull request #762 from mattrpav/AMQ-8443-tests
[AMQ-8443] Add unit test
2022-02-09 10:48:04 -05:00
Matt Pavlovich 09458713aa [AMQ-8443] Add unit test 2022-02-09 08:50:24 -06:00
Christopher L. Shannon a7109bc025
Merge pull request #761 from mattrpav/AMQ-8397-tests
[AMQ-8397] Add unit tests for AMQ-8397
2022-02-09 06:33:52 -05:00
Matt Pavlovich 9d8ee0d3b7 [AMQ-8397] Add unit tests for AMQ-8397 2022-02-08 22:19:57 -06:00
Matt Pavlovich 2a9f777aab [AMQ-8413] NetworkConnectore remote user and pass unit test 2022-02-07 08:22:27 -06:00
Christopher L. Shannon fb036974ca
Merge pull request #758 from mattrpav/AMQ-8053b
[AMQ-8053] UserIDBroker unit tests
2022-02-07 08:28:08 -05:00
Christopher L. Shannon (cshannon) 26a3c55833 AMQ-8412 - Add wireformat negotiation test for maxFrameSizeEnabled
Verify that maxFrameSizeEnabled being configured on the client or the
server is not negotiated and won't affect the other
2022-02-07 08:03:06 -05:00
Matt Pavlovich 67a2edbf0d [AMQ-8412] Update client-side maxFrameSize handling to be more symetrical with server-side
- Handle in the OpenWireFormat class
 - Add unit tests to confirm
 - Verify compression is accounted for
 - Verify the ability to disable using wireFormat.maxFrameSizeEnabled=false
 - [cshannon] Reworked max frame size test case to add in all transports and all client/server cases
2022-02-06 17:45:11 -06:00
Matt Pavlovich 49f1b2c903 [AMQ-8053] UserIDBroker unit tests 2022-02-06 12:46:44 -06:00
Endre Stølsvik 9167a79b79 StatisticsBrokerPlugin: Add feat: request destination firstMessageTimestamp
Adding a feature (STATS_FIRST_MESSAGE_TIMESTAMP) to the
StatisticsBrokerPlugin's destination-statistics for getting the
timestamp of the first message in the destination(s) being requested: If
you on the query-message set the property
StatisticsBroker.STATS_FIRST_MESSAGE_TIMESTAMP to anything (e.g. boolean
true), a long value "firstMessageTimestamp" will be added to the
statistics reply message(s). Since the reply message has JMSTimestamp
set, which is the broker's now-timestamp, you may also on the query side
calculate the age of the first message in milliseconds. The key name was
chosen since that is the name of the corresponding feature in Artemis.

This extension of the existing feature is implemented to be as
non-intrusive as possible, adding very little runtime cost if not
requested. It also seems like the runtime cost for enabling this
feature, thus finding and adding the firstMessageTimestamp, is small.

While at it, also slightly improving an existing feature
(STATS_DENOTE_END_LIST) where a reply to a destination query can be
"null terminated": After sending the relevant replies, the
StatisticsBroker also sends an empty message. This feature is relevant
if the query is a wildcard query, thus returning multiple messages: The
empty message denotes the end of the replies. However, to activate this
feature, a somewhat complicated query destination had to be constructed.
Adopting the solution for the other StatisticsBroker feature where you
may reset the broker statistics by adding a property to the query
message, this null-termination feature now /also/ checks for the
presence of this query modifier STATS_DENOTE_END_LIST as a property.
(This property based solution was thus also adopted for the present
'firstMessageTimestamp' solution, as it was found much more intuitive).

Added tests for both the STATS_FIRST_MESSAGE_TIMESTAMP query modifier,
and the improved STATS_DENOTE_END_LIST property-based query modifier.

Had to make the Topic.doBrowse(List browseList, int max) public - the
corresponding method for Queue was already public.

Made the evaluation of whether this is a StatisticsBroker-relevant
message a microscopic bit more performant (exiting faster if not
relevant): To the initial test of whether the message is relevant, which
only checked for replyTo being set, a check for 'destination.
startsWith("ActiveMQ.Statistics")' was added. Only if so, the rest of
the evaluations kick in. Also using 'string.startsWith(..)' instead of
the verbose 'string.regionMatches(..)'.

Removed an unused import on PartitionBrokerTest.java, as IntelliJ
complained about not finding it.
2022-01-25 09:45:48 +01:00
Jean-Baptiste Onofré 3d2fb2b609
Merge pull request #707 from AlexejTimonin/sendTextMessageWithProperties-delimiter
[AMQ-8372] Allow custom delimiter when sending TextMessages via MBean
2022-01-22 17:14:03 +01:00
Jean-Baptiste Onofré ee21925c08 [AMQ-7325] Upgrade to Derby 10.15.2.0 2022-01-17 16:29:53 +01:00
Jean-Baptiste Onofré de563e76ce
Merge pull request #738 from mattrpav/AMQ-8341
[AMQ-8341] Remove FTP Blob strategy
2022-01-15 07:01:25 +01:00
Jean-Baptiste Onofré ff134fd135 [AMQ-8456] Fix unit test compilation 2022-01-12 20:36:29 +01:00
Matt Pavlovich 2e784d07be [AMQ-8341] Remove FTP Blob strategy
- Remove commons-net dependency
2022-01-12 11:05:43 -06:00
Matt Pavlovich 67256c61b1
[AMQ-7309] Update to jakarta.jms/jakarta.jms-api:2.0.3 (#682)
- API update only
 - Throw UnsupportedOperationException
 - Disable activemq-camel from build
 - Formatting fixes
 - Use geronimo-jms for osgi-related artifacts
 - Fix features.xml invalid xml header
 - Add a unit test to confirm JMS 2.0 methods for phase 1 (throw UnsupportedOperationException)
 - Add deliveryTime field to Message
 - Minor formatting fixes
2021-11-10 11:56:04 -06:00
Alexej Timonin 7c63227003 Allow custom delimiter when sending TextMessages via MBean
This enables possibility to send messages containing commas in the body
with tools such as jconsole.
Example simple text as body: body=Hello, world!
Example json as body: body={"a":"b","c":"d"}
2021-09-04 22:31:22 +02:00
Matt Pavlovich c1a2ff25c1
[AMQ-8033] Remove activemq-camel (#701)
* [AMQ-8033] Remove activemq-camel

 - Prerequisite for JMS v2.0 support

* [AMQ-8033] Remove activemq-camel

 - Prerequisite for JMS v2.0 support

* [AMQ-8033] Assembly and karaf clean-ups
2021-09-03 11:21:13 -05:00
Christopher L. Shannon (cshannon) 8b99596eeb AMQ-8349 - Ensure virtual destination consumer advisories are only
replayed to new advisory consumers and not existing
2021-08-05 09:58:37 -04:00
gtully c4d2ddfce9 AMQ-7298 - fix regression with broker redelivery plugin, fix and test relates to AMQ-8168 2021-04-16 13:12:13 +01:00
charlie-aws f8b0db2dd4 fix BrokerServiceTest by replacing powermock
fix BrokerServiceTest by replacing powermock
2021-03-29 10:30:47 -07:00
Jean-Baptiste Onofré 25b639c464
Merge pull request #593 from jbonofre/AMQ-7502
[AMQ-7502] Remove leveldb
2021-03-29 18:00:36 +02:00
charlie-aws 30986e372c AMQ-8189 add wait time to CachedLDAPAuthorizationModuleTest 2021-03-25 13:05:37 -07:00
jbonofre 52a2bd446a [AMQ-7502] Remove leveldb 2021-03-25 18:54:53 +01:00
Jean-Baptiste Onofré fc0999cc87
Merge pull request #639 from charlie-cyf/AMQ8190
AMQ-8190 add wait time & shrink duration for CI test run
2021-03-25 12:51:22 +01:00
Jonathan Gallimore edd0515d90 AMQ-8201 Forward commit commands for local transactions as well as XA transactions during ACK compaction 2021-03-25 11:02:53 +00:00
Charlie Chen 6691e23e48 AMQ-8190 add wait time & shrink duration for CI test run 2021-03-24 20:35:07 -07:00
gtully 09389d1ef3 AMQ-8202 - fix concurrency issue on tracking stores in mKahaDB, exposed by virtual topic concurrentSend 2021-03-24 15:55:44 +00:00
kimmking b6ab868f94
ClientIdFilterDispatchPolicy dispatches messages in a topic to a given client. Then the message with a PTP_CLIENTID property, can be received by a mqtt client with the same clientId. (#238) 2021-03-22 16:22:01 +01:00
Christopher L. Shannon (cshannon) 2cf3decd8e AMQ-8184 - Re-enable NIO tests
Re-enable the nio transport tests in activemq-unit-tests by default to
catch transport errors. Also fix broken tests
2021-03-11 11:16:29 -05:00
Christopher L. Shannon (cshannon) 944ca6c7e1 AMQ-8183 - prevent infinite loop when maxFrameSize is exceeded
This makes sure the nio transport thread properly terminates if
maxFrameSize is exceeded with OpenWire to prevent an infinite loop that
uses up all the cpu
2021-03-11 09:59:36 -05:00
gtully 2f40261362 AMQ-8131 - revert treating unmatched as real acks b/c individual acks are not tracked. make use of enableMessageExpirationOnActiveDurableSubs to ensure unmatched can eventually expire 2021-02-01 12:11:30 +00:00
gtully e1b3204407 AMQ-8131 - track unmatched acks in the acks table 2021-01-28 14:46:29 +00:00
jbonofre 295400ae33 Fix missing ASF header 2021-01-13 15:17:06 +01:00
Marcono1234 9d220c286d
README and minor code fix (#598)
Fix README link and cleanups
2021-01-05 16:15:04 +01:00
Roman Nevezhyn 651c5ff2cf - Tests AMQ-8104
- Fixes AMQ-8104
2020-12-16 12:54:03 -08:00
jbonofre 671f201a85 Quick fix on InMemoryJobSchedulerTest 2020-12-02 10:06:11 +01:00
jbonofre 2bc87c2c5f [AMQ-8068] Fix topic memory leak on message eviction using UniquePropertyMessageEvictionStrategy 2020-11-23 06:26:37 +01:00
jbonofre 5c7e23ac90 Increase AMQ6815Test timeout (failing on slow machine like Jenkins) 2020-11-23 06:26:04 +01:00
Jean-Baptiste Onofré fbdb302968
Merge pull request #571 from dhmgit/durable-sub-message-expiration
Adding an option which allows messages to expire on active durable subscriptions
2020-11-22 07:10:43 +01:00
murali.mogalayapalli 55914d3ac1 [AMQ-8028] Add sendWhenNotMatched option to composite destination filter 2020-11-21 14:20:08 +01:00
jbonofre c9e4abf274 Give more time to AMQ6815Test (for Jenkins) 2020-11-19 08:43:50 +01:00
jbonofre 75c3fd4c34 Improve AMQ7118Test stability 2020-11-18 09:02:25 +01:00
dhmgit 2f2fe6855f adding an option which allows messages to expire on active durable subscriptions 2020-11-10 10:22:32 -05:00
gtully 0c986c33f6 AMQ-8039 - support system property configuration of the inactivity monitor thread pool, follow example of nio. new test to verify 2020-09-11 10:39:15 +01:00
gtully 0e2b24be36 AMQ-8023 - serialize sub add with destination removal advisory processing to avoid resub blocking a necessary purge via removal, fix and test via mqtt clean session scenario 2020-08-25 16:56:50 +01:00
Jean-Baptiste Onofré d2851888bf
Merge pull request #551 from coheigea/AMQ-7513
AMQ-7513 - Fix http://activemq.org links
2020-08-11 09:42:43 +02:00
Christopher L. Shannon (cshannon) 17defa79d4 NO-JIRA: Update branch to 5.17.0-SNAPSHOT after release 2020-07-14 07:27:43 -04:00
Colm O hEigeartaigh fca3b615eb AMQ-7513 - Fix http://activemq.org links 2020-07-10 17:29:01 +01:00
gtully b3386c8ac7 no jira - add selector on originalDestination attribute test 2020-07-06 16:56:30 +01:00
Jean-Baptiste Onofré 334476ac63 [maven-release-plugin] prepare for next development iteration 2020-06-25 07:26:41 +02:00
Jean-Baptiste Onofré 86dd78b1aa [maven-release-plugin] prepare release activemq-5.16.0 2020-06-25 07:26:13 +02:00
Jean-Baptiste Onofré 6908749c2f Fix version 2020-06-25 07:13:04 +02:00
Jean-Baptiste Onofré ff2dae82f3 [maven-release-plugin] prepare release activemq-5.16.0 2020-06-24 21:56:52 +02:00
Christopher L. Shannon (cshannon) 5901d9a6f0 AMQ-7505 - Adding missing license headers to two source files 2020-06-24 13:22:09 -04:00
jbonofre 4ed2ba22a9 Cancel 5.16.0 release 2020-06-24 15:19:34 +02:00
Jean-Baptiste Onofré cd1e9f8697 [maven-release-plugin] prepare for next development iteration 2020-06-23 17:40:26 +02:00
Jean-Baptiste Onofré 2e890c6224 [maven-release-plugin] prepare release activemq-5.16.0 2020-06-23 17:39:53 +02:00
Jean-Baptiste Onofré 4991668549
Merge pull request #517 from coheigea/AMQ-7450
AMQ-7450 - Put some restrictions on the URLs that are allowed in Blob…
2020-06-23 07:01:38 +02:00
Christopher L. Shannon (cshannon) d539ff77b9 (AMQ-7496) - Improve inflight message size test accuracy and reliability 2020-06-11 07:01:11 -04:00
Christopher L. Shannon (cshannon) cc0bcdd5dc AMQ-7496 - Properly decrement inflight message size on message
expiration

Also clean up some of the handling of inflight metrics in Prefetch
subscription
2020-06-10 11:36:34 -04:00
Colm O hEigeartaigh 45108a2328 AMQ-7450 - Put some restrictions on the URLs that are allowed in BlobMessages 2020-05-25 14:24:10 +01:00
gtully 62cfe83e9d [AMQ-7291] rework fix to initializeWriting but just with the read only properties check 2020-05-21 10:41:58 +01:00
Jean-Baptiste Onofré 4bb7b1806c Make DurablePersistentFalseRestartTest more robut on slow machine 2020-05-21 08:13:51 +02:00
Jean-Baptiste Onofré 2d83af17ba Make JMSConsumerTest more robust on slow machine 2020-05-21 08:04:49 +02:00
gtully 8bedeb4b9b [AMQ-7008] fix test dependent on the number of jdbc calls, now two new ones 2020-05-20 14:45:11 +01:00
gtully cedac472a1 [AMQ-7488] mkahadb - detect txStore corruption and suspend recovery, auto recover if no outcomes pending 2020-05-20 12:43:37 +01:00
gtully 0ebb0f88ef [AMQ-7485] add check for rollbackonly flag in session send such that failed ended transactions prevent further work till next transaction boundary 2020-05-15 15:39:56 +01:00
Jean-Baptiste Onofré 41bef94293
Merge pull request #521 from coheigea/AMQ-7458
AMQ-7458 - Implement bounds checking on the message scheduling proper…
2020-05-15 15:52:23 +02:00
jbonofre e9caa75b1a [AMQ-7473] Add stopOnError configuration to stop the broker when locker has an exception 2020-05-13 07:53:00 +02:00
gtully aa03f295f5 AMQ-7464 - ensure message.copy before server session run dispatch 2020-04-08 14:57:49 +01:00
Colm O hEigeartaigh 24aaa4698c AMQ-7458 - Implement bounds checking on the message scheduling properties 2020-03-27 12:14:03 +00:00
Jean-Baptiste Onofré da9e4028c9
Merge pull request #513 from coheigea/AMQ-7447
AMQ-7447 - Update copyright years
2020-03-27 10:29:42 +01:00
Jean-Baptiste Onofré 4d968391a7
Merge pull request #518 from coheigea/AMQ-7454
AMQ-7454 - Remove xmpp artifacts
2020-03-27 10:22:48 +01:00
Colm O hEigeartaigh 9599ad8d95 AMQ-7457 - Support wider password encryption schemes 2020-03-27 08:34:10 +00:00
Colm O hEigeartaigh 1c504160d8 AMQ-7454 - Remove xmpp artifacts 2020-03-26 11:36:41 +00:00
Colm O hEigeartaigh c3cdffb373 AMQ-7447 - Update copyright years 2020-03-20 07:14:43 +00:00
jbonofre 3cb8fe87ea [AMQ-7403] Fix LeaseDatabaseLockerTest unit test (jmock assertion) 2020-03-11 18:00:16 +01:00
jbonofre 6355f507c3 Revert "AMQ-7291 - allow setting properties after clearProperties for BytesMessage, closes #420"
This reverts commit 503416a001.
2020-03-10 16:16:01 +01:00
jbonofre d878d877d5 [AMQ-7410] Align dependencies with Apache Karaf 2020-02-26 13:11:33 +01:00
Jean-Baptiste Onofré 11cdb5cb59 Ignore one unit test to avoid build failure on Jenkins (need refactoring) 2020-02-26 08:49:54 +01:00