Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,353 Commits 21 Branches 100 Tags 93 MiB
Commit Graph

827 Commits

Author SHA1 Message Date
Timothy Bish b027e65553 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.
 2016-04-19 09:53:58 -04:00
gtully 6541bef52d fix logger name 2016-04-18 15:05:31 +01:00
Christopher L. Shannon (cshannon) b9f9f03829 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.
 2016-04-15 13:01:21 +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
gtully 530c1a8193 https://issues.apache.org/jira/browse/AMQ-6240 - tidy up test and reduce duration. reuse closeTimeout on rollback during close which is the case here 2016-04-14 12:25:11 +01:00
Timothy Bish 82330793e9 https://issues.apache.org/jira/browse/AMQ-5621 
Clean up the test, use timeouts and add a few more iterations to try and
reproduce recent CI failures from this test.
 2016-04-13 15:17:14 -04:00
Brian D. Johnson 7a61718e02 https://issues.apache.org/jira/browse/AMQ-6244 - reset ActiveMQBytesMessage 'compressed' flag after restoring compressed content 2016-04-13 14:19:06 +00:00
Christopher L. Shannon (cshannon) 7f86825337 NO-JIRA - Adding activemq-junit dependency to activemq-unit-tests 2016-04-13 13:21:48 +00:00
gtully 77d46dc139 https://issues.apache.org/jira/browse/AMQ-6240 use sendTimout on sync rollback on close such that a blocked connection won't block a close 2016-04-13 11:55:59 +01:00
Christopher L. Shannon (cshannon) 5ec4513ffb https://issues.apache.org/jira/browse/AMQ-5923 
Adding missing assertion statements
 2016-04-12 15:52:26 +00: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
Christopher L. Shannon (cshannon) 485fcafcdf https://issues.apache.org/jira/browse/AMQ-5923 
Updating tests to check prioritized messages as well
 2016-04-12 14:13:52 +00: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
Timothy Bish 0fb24cc4c1 Allow some extra time on the consumer wait to account for slow CI boxes 2016-03-30 14:23:33 -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
Timothy Bish a9521dcebf 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.
 2016-03-15 12:02:40 -04:00
Timothy Bish 946e62d702 https://issues.apache.org/jira/browse/AMQ-6203 
Rewrite older acks that can be preventing GC of log files.
 2016-03-14 11:04:57 -04:00
gtully ae441cbc7d https://issues.apache.org/jira/browse/AMQ-6208 - fix and test 2016-03-11 12:01:18 +00:00
gtully 521c4fd8c3 extend timeout - running too close to the limit for comfort 2016-03-09 22:13:46 +00:00
Christopher L. Shannon (cshannon) a2781e3966 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.
 2016-03-09 19:54:08 +00:00
gtully 078f39f589 https://issues.apache.org/jira/browse/AMQ-6199 - apply CursorMemoryHighWaterMark to topic subscriptions 2016-03-08 16:45:06 +00:00
gtully e313f40989 https://issues.apache.org/jira/browse/AMQ-6175 - fix unit test regression SelectiveMBeanRegistrationTest 2016-03-08 11:55:46 +00:00
gtully 13ec994939 Revert "https://issues.apache.org/jira/browse/AMQ-4495 - revisit. Reinstate check for space on pagein, so that highWaterMark is respected and full state is not reached, hense pfc is not triggered in error" 
This reverts commit d8cf54b0a9.
 2016-03-07 16:26:25 +00:00
Christopher L. Shannon (cshannon) 903dec615c https://issues.apache.org/jira/browse/AMQ-6194 
Fixing an issue that caused statistics for a transactional temporary
queue to be updated twice by mistake.  Moved the statistics update into
tryOrderedCursorAdd so that the update is called immediately only if
not inside a transaction.
 2016-03-07 14:15:35 +00:00
gtully d8cf54b0a9 https://issues.apache.org/jira/browse/AMQ-4495 - revisit. Reinstate check for space on pagein, so that highWaterMark is respected and full state is not reached, hense pfc is not triggered in error 2016-03-01 11:44:41 +00:00
Brian D. Johnson 552c0f0f7a https://issues.apache.org/jira/browse/AMQ-6188 - reset BaseDestination.lastActiveTime each time a message is delivered to the broker. 2016-02-26 20:46:32 +00:00
Timothy Bish c2ad0c3251 AMQ-6183 Add isDispatchSync to the subscription view and deprecate the 
meaningless one in the producer view
 2016-02-24 17:25:01 -05:00
gtully fd76088814 https://issues.apache.org/jira/browse/AMQ-5875 - additional test that shows durable sub registration does not error out with this fix 2016-02-17 14:09:05 +00:00
gtully b0c0441d09 https://issues.apache.org/jira/browse/AMQ-6171 - fix vm transport replacement of : from brokerName in error, fix networkConnector retry logic in the event of localTransport creation failure 2016-02-15 14:14:19 +00:00
Timothy Bish 386210fafe https://issues.apache.org/jira/browse/AMQ-6159 
Ensure proper repeat counts are scheduled.
 2016-02-04 17:16:58 -05:00
Christopher L. Shannon (cshannon) 25ff5699f1 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.
 2016-02-04 15:17:49 +00:00
gtully c17b7fdc7f add trace level log to shared file locker keepAlive 2016-02-04 13:28:59 +00:00
Timothy Bish 8c4b5f485d 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.
 2016-02-02 20:28:24 -05:00
Christopher L. Shannon (cshannon) 5f7a81f928 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.
 2016-02-01 17:27:19 +00:00
gtully 5af5b59d3b https://issues.apache.org/jira/browse/AMQ-6151 - respect prioritizeMessages for pending and redelivered messages 2016-02-01 12:19:49 +00:00
gtully acbe31fcb5 https://issues.apache.org/jira/browse/AMQ-6137 - deal with 'special' escape chars in like selector expression 2016-01-22 15:30:16 +00:00
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual 
release version.
 2016-01-20 12:40:20 -05:00
Christopher L. Shannon (cshannon) b4aa53d806 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.
 2016-01-20 16:59:07 +00:00
Timothy Bish 193f6be687 https://issues.apache.org/jira/browse/AMQ-6131 
Fix check for durable sub with no pending messages during checkpoint
cleanup.
 2016-01-18 17:43:18 -05:00
Christopher L. Shannon (cshannon) 1ae29382e1 https://issues.apache.org/jira/browse/AMQ-6129 
Fixing DynamicallyIncludedDestinationsDuplexNetworkTest
 2016-01-18 15:27:11 +00:00
Dejan Bosanac a3fa0da6ec https://issues.apache.org/jira/browse/AMQ-6130 - java beans @Transient annotation 2016-01-18 09:38:09 +01:00
Timothy Bish 4ea435bf46 https://issues.apache.org/jira/browse/AMQ-5336 
URI comparison needs to be done using the host / port comparison method
instead of string equality due to other features like nested options
which can alter the URIs and lead to continued attempts to reconnect to
the transport that's already connected when priority backup is used.
 2016-01-15 18:07:56 -05:00
Christopher L. Shannon (cshannon) 10c998b0bc https://issues.apache.org/jira/browse/AMQ-6129 
Adding NetworkBridgeStatistics and also a received count for bridges
when they are in duplex mode.
 2016-01-15 14:54:04 +00:00
gtully 2b84cd60ba https://issues.apache.org/jira/browse/AMQ-6128 - fix and test - fix values on priority ordered pending - messages assigned to browsers need to be ordered 2016-01-15 14:31:09 +00:00
Timothy Bish 5b73ffad6b https://issues.apache.org/jira/browse/AMQ-6117 
Test to try and reproduce the issue.
 2016-01-14 18:28:08 -05:00
Timothy Bish 9287055338 https://issues.apache.org/jira/browse/AMQ-6125 
Ensure that the redelivery policy is never null in the consumer.
 2016-01-13 18:08:18 -05:00
Timothy Bish b9805f7ac0 NO-JIRA Update test to ACK in transacted batches to group Ack values to 
avoid the test failure based on the even spread of acks across journal
files preventing file GC which causes the test to fail.
 2016-01-12 13:51:56 -05:00
Timothy Bish 505a76a8bb 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.
 2016-01-12 11:51:48 -05:00
gtully db1506a592 https://issues.apache.org/jira/browse/AMQ-6124 - fix and test - propagate broker info from prestarted backup transport 2016-01-12 14:00:13 +00:00
Timothy Bish 66cfc7bab3 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.
 2016-01-11 10:57:38 -05:00
Altaflux 3bb7e4a5c8 Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations 
https://issues.apache.org/jira/browse/AMQ-6052
closes #164
 2016-01-11 12:59:33 +00:00
Altaflux 6b1e87410d Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations 2016-01-11 12:59:33 +00:00
Christopher L. Shannon (cshannon) b7db97d8e2 https://issues.apache.org/jira/browse/AMQ-6100 
Adding missing LICENSE header
 2016-01-06 15:49:50 +00:00
gtully 16bc0f0d75 https://issues.apache.org/jira/browse/AMQ-6089 - support TMNOFLAGS as a scan end to allow looping calls to recover to terminate 2016-01-06 12:54:20 +00:00
gtully e3df09b9db 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 2016-01-05 14:09:16 +00:00
Christopher L. Shannon (cshannon) fc4c697d44 NO JIRA - cleanup imports 2015-12-22 13:11:28 +00:00
Timothy Bish 564d55023e https://issues.apache.org/jira/browse/AMQ-6102 
Call to the statistics instance of the subscription to reset the
counters.
 2015-12-21 17:03:24 -05:00
Dejan Bosanac 4e63ee7cc7 https://issues.apache.org/jira/browse/AMQ-6100 - Virtual topic message destination should be the target queue 2015-12-21 15:19:22 +01:00
Christopher L. Shannon (cshannon) 370b181099 https://issues.apache.org/jira/browse/AMQ-6097 
remove un-needed import statements
 2015-12-18 19:47:46 +00:00
Christopher L. Shannon (cshannon) 246ccb8e04 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.
 2015-12-18 19:26:24 +00:00
gtully b7787bf6fb 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 2015-12-14 16:46:22 +00:00
gtully 455a628305 https://issues.apache.org/jira/browse/AMQ-6086 - avoid logging npe on attempted start of persistence adapter post stop 2015-12-14 16:32:10 +00:00
gtully 35df815fb8 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. 2015-12-14 15:40:05 +00:00
gtully da076f4a63 https://issues.apache.org/jira/browse/AMQ-6086 - add some determinism to interleaved stop and start calls on broker service 2015-12-11 16:22:31 +00:00
gtully 8609f74db3 https://issues.apache.org/jira/browse/AMQ-6083 - ignore test scenario on leveldb store 2015-12-11 11:21:06 +00:00
gtully 768fa17085 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 2015-12-10 14:24:03 +00:00
gtully d7febddb67 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 2015-12-10 11:23:56 +00:00
gtully 5db5f3e39a 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 2015-12-09 12:30:29 +00:00
gtully 179dc3acb2 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 2015-12-08 11:05:25 +00:00
Timothy Bish 315147c5ef 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.
 2015-12-07 12:27:34 -05:00
gtully 75ff17af41 https://issues.apache.org/jira/browse/AMQ-6070 - set correct originalDestination property value in advisories 2015-12-03 12:14:18 +00:00
Christopher L. Shannon (cshannon) 8363c99b51 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.
 2015-12-02 13:24:32 +00:00
gtully 144b711a9a add some additional trace debug to investigate linear store usage, this test has been failing in ci for the past 7 builds but work ok locally. This additional trace will help diagnose 2015-11-30 14:04:27 +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 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
Christopher L. Shannon (cshannon) 95f58fa7c4 https://issues.apache.org/jira/browse/AMQ-6027 
Adding back in test case now that AMQ-5898 is resolved
 2015-11-25 19:13:24 +00:00
Christopher L. Shannon (cshannon) 35b7ac250b https://issues.apache.org/jira/browse/AMQ-5898 
Removing assertion in VirtualDestinationInterceptor to allow
multiple composite destinations to forward to a physical destination
 2015-11-25 13:33:32 +00:00
Christopher L. Shannon (cshannon) 9acee62877 https://issues.apache.org/jira/browse/AMQ-5963 
Making unit test more robust
 2015-11-24 20:40:10 +00:00
Timothy Bish ef129c21cd NO-JIRA ensure each test has a store with its own directory. 2015-11-24 11:17:25 -05:00
Chad Zobrisky dca6e4506e AMQ-6058 added a check to make sure the destination starts with the virtual topic prefix. 2015-11-23 20:10:26 +00:00
Timothy Bish 8be1486508 NO-JIRA: Add a delay to fail in case an async operation has not fully 
created the DLQ yet.
 2015-11-23 14:24:06 -05:00
Christopher L. Shannon (cshannon) de5d0d9430 https://issues.apache.org/jira/browse/AMQ-5854 
Fix intermittent test failure caused by the test reconnecting before
the failure assertion had a chance to assert the expected failure
 2015-11-22 18:36:38 +00:00
Timothy Bish 4a27b72377 https://issues.apache.org/jira/browse/AMQ-6042 
Apply fix and test from Martin Lichtin to preserve the rollback cause in
all ack modes.
 2015-11-20 16:18:27 -05:00
Christopher L. Shannon (cshannon) cc6213ebf2 https://issues.apache.org/jira/browse/AMQ-5712 
Switching addMessageLast to tryAddMessageLast when messages are added
to a Queue pending cursor to allow a potential deadlock to be
avoided. There is more work to be done here but this will at least
prevent a deadlock from occurring.

Fix and test based off of a patch created by Timothy Bish.
 2015-11-20 20:58:27 +00:00
gtully 64aac4ce73 org.apache.activemq.network.VirtualConsumerDemandTest can take more than 10mins - increasing the fork limit 2015-11-18 16:08:29 +00:00
gtully 15412bae64 AMQ4221Test - remove system exit as it breaks surefire fork, https://issues.apache.org/jira/browse/AMQ-6004 interrupt causes errors on shutdown. Two are sorted but the check for errors in the logs may still cause intermittent failures 2015-11-18 16:08:29 +00:00
Christopher L. Shannon (cshannon) 09054fc4a8 https://issues.apache.org/jira/browse/AMQ-6050 
Clearing the subscription from the local map in
DemandForwardingBridgeSupport to make sure that demand can be properly
recreated again.
 2015-11-18 15:06:33 +00:00
Christopher L. Shannon (cshannon) 86ead7e9d2 fixing unit test to dynamically use a free port 2015-11-12 15:55:29 +00:00
Christopher L. Shannon (cshannon) d328864410 tweaking PeriodicDiskUsageLimitTest 
Increasing the size of the files written during testing to try
and reduce the change of a test failure
 2015-11-11 13:12:02 +00:00
Timothy Bish 078a101cf7 https://issues.apache.org/jira/browse/AMQ-6000 
Fix and test, wakeup queue dispatch when resume is called.
 2015-11-10 15:39:51 -05:00
Christopher L. Shannon (cshannon) 3ef6a9f769 https://issues.apache.org/jira/browse/AMQ-6027 
Fixing unit test to pass assertion
 2015-11-10 18:42:03 +00:00
Christopher L. Shannon (cshannon) 0c846cf8f6 https://issues.apache.org/jira/browse/AMQ-6027 
Tweaking test case to apply virtual destination updates immediately
 2015-11-10 14:45:37 +00:00
Christopher L. Shannon (cshannon) cc81680e10 https://issues.apache.org/jira/browse/AMQ-6027 
Adding support for consumers on virtual destinations to create network
demand. This behavior is turned off by default but can be enabled.

For example, if a consumer comes online for a queue that is part of a
VirtualTopic, this will cause a network of brokers to forward messages
because a demand subscription will be created. Same for if a consumer
comes online for a forwarded destination from a composite
destination.

There is also an option to enable flow based on the existence of a
virtual destination if the virtual destination is forwarding to a
Queue.

Full configuration instructions for this feature will be on the wiki page.
 2015-11-09 20:07:43 +00:00
gtully fd0f71a4c8 https://issues.apache.org/jira/browse/AMQ-6033 - fix shadowing error, additional test 2015-11-02 15:08:22 +00:00
Timothy Bish 014d5594d6 AMQ-6032 Repack message prior to scheduler dispatch to store updated 
properties in marshaled form.
 2015-10-30 14:11:06 -04:00
Dejan Bosanac f09b9203a0 https://issues.apache.org/jira/browse/AMQ-6021 - mqtt+nio+ssl certificate authentication 2015-10-23 15:25:33 +02:00
gtully 92d5efc32c https://issues.apache.org/jira/browse/AMQ-6014 - test needs more time in ci. need to figure why it is sooo slow 2015-10-21 13:06:13 +01:00