Commit Graph

936 Commits

Author SHA1 Message Date
gtully 231679d936 https://issues.apache.org/jira/browse/AMQ-5603 - don't async preallocate to keep match data file count 2016-05-04 16:15:55 +01:00
gtully ba77b9f55a https://issues.apache.org/jira/browse/AMQ-6277 - tidy up logic that determines recovery location so that we don't recovery from the end of the journal in error on normal restart. This avoids suprious recovery logging 2016-05-03 12:47:49 +01:00
gtully 4f43a21212 https://issues.apache.org/jira/browse/AMQ-5603 - one more journal in the mix for this test with async preallocation 2016-05-03 11:36:47 +01:00
gtully 62bdbb0db5 https://issues.apache.org/jira/browse/AMQ-5603 - add preallocationScope=full_journal_async that will preallocate a journal in advance or use to avoid latency jitter on journal rotation. Added none option to disable preallocation 2016-04-29 16:57:28 +01:00
Timothy Bish 3c342ffce4 Add some additional checks for valid state. 2016-04-27 14:50:43 -04:00
Christopher L. Shannon (cshannon) 297eadf746 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.
2016-04-27 14:11:05 +00:00
Timothy Bish 765a010d04 https://issues.apache.org/jira/browse/AMQ-5621
Add sleep back which allows the producers to wait for the bridge
formation.
2016-04-25 18:41:00 -04:00
Timothy Bish 10478c313e https://issues.apache.org/jira/browse/AMQ-5621
Update tests to not use hardcoded port for the transport connector and
remove the unneeded sleep calls with proper test setup
2016-04-20 15:16:36 -04:00
Timothy Bish 8a30026e82 Drop back to original iterations now and give some extra time on test
timeouts.
2016-04-19 12:54:18 -04:00
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
gtully a01578ad4c fix stop/stop or stop no start NPE on sharedfilelocker 2015-10-20 13:02:57 +01:00
gtully 1ad0117932 https://issues.apache.org/jira/browse/AMQ-6014 - fix up reference counting for durable subs such that ack on one sub does not decrement usage for offline subs. Fix and test 2015-10-19 16:22:57 +01:00
gtully dc06c8dc75 https://issues.apache.org/jira/browse/AMQ-5994 https://issues.apache.org/jira/browse/AMQ-4000 - proper fix for duplicate sub info from the store on recovery failure from AMQ2149Test. Additional test from Christopher L 2015-10-06 12:01:24 +01:00
Timothy Bish 81b4b9ae3d https://issues.apache.org/jira/browse/AMQ-5996
When possible check for noLocl changes on durable subscription
reactivation and recreate the durable sub if it changes.  For both
selector change and noLocal change also update the AbstractSubscription
selectorExpression so it matches with what was requested.
2015-10-01 19:23:58 -04:00
gtully fc25535748 https://issues.apache.org/jira/browse/AMQ-5854 - fix intermittent test failure 2015-09-30 11:41:08 +01:00
gtully 8514e38135 https://issues.apache.org/jira/browse/AMQ-5951 - scenario wheere transaction command can block, additional test and further fix 2015-09-30 11:41:08 +01:00
gtully 92e1f60d98 https://issues.apache.org/jira/browse/AMQ-5854 - tidy up test 2015-09-29 13:11:29 +01:00
gtully 8d982479e9 https://issues.apache.org/jira/browse/AMQ-5854 - fix and test. Ensure transaction rollback if there are pending acks during a failover reconnect. Reliably tracking pending acks to eusure possible redelivery is too complex in the context of acks getting dropped by failover or ignored by the subscription, in addition to being sent async. Couple that with multiple consumers on the same connection and the locking of message delivery; only safe course is to ensure rollback outcome. 2015-09-28 14:29:57 +01:00
gtully cc9b9b0843 https://issues.apache.org/jira/browse/AMQ-5938 - remove unnecessary topic cast - breaks auth scenario. Fix and test 2015-09-21 14:48:44 +01:00
Christopher L. Shannon (cshannon) 5107262998 AMQ-5964 - Increasing test timeouts 2015-09-17 20:04:37 +00:00
Christopher L. Shannon (cshannon) d2bd152960 Tweaking some unit tests to improve reliability 2015-09-17 11:28:14 +00:00
Dejan Bosanac ee4672baaf https://issues.apache.org/jira/browse/AMQ-5972 - wildcard policy entries not applied in correct order 2015-09-17 11:08:21 +02:00
Christopher L. Shannon (cshannon) 8a09b7e5f6 AMQ-5923 - Increasing test timeout times
Logging showed that intermittent test failures were caused by not
giving the tests enough time to finish. Also switched message
generation to create random sizes in order to improve testing.
2015-09-16 14:57:30 +00:00
Christopher L. Shannon (cshannon) 4cddd2c015 https://issues.apache.org/jira/browse/AMQ-5963
Disk limits can now be specified as a percentage of the partition size
that the store is located on.  The usual checks of the max size
exceeding the available space will still apply.  When using a
percentage, the store can always regrow itself if space becomes
available.

https://issues.apache.org/jira/browse/AMQ-5964
https://issues.apache.org/jira/browse/AMQ-5965
https://issues.apache.org/jira/browse/AMQ-5969
2015-09-15 14:50:18 +00:00
Christopher L. Shannon (cshannon) 226222546a Adding logging to help debug test failures
https://issues.apache.org/jira/browse/AMQ-5923
2015-09-11 12:09:25 +00:00
Christopher L. Shannon (cshannon) d27b192553 https://issues.apache.org/jira/browse/AMQ-5923
Removing TemporaryFolder usage in Junit tests to try and fix the
tests that are hanging when messages are produced.
2015-09-10 19:43:01 +00:00
Christopher L. Shannon (cshannon) 3ec560f2a8 https://issues.apache.org/jira/browse/AMQ-5923
Making message size statistic tests more reliable
2015-09-10 16:23:43 +00:00
Christopher L. Shannon (cshannon) d1dface01a https://issues.apache.org/jira/browse/AMQ-5923
Adding a null pointer check in PListImpl to prevent a null
pointer exception on remove
2015-09-10 11:23:27 +00:00
Christopher L. Shannon (cshannon) 734fb7dda3 https://issues.apache.org/jira/browse/AMQ-5923
Adding metrics to track the pending message size for a queue and for
subscribers.  This is useful so that not only the pending count is
known but also the total message size left to consume. Also improving
the message size store tests as well.
2015-09-09 18:12:15 +00:00
Christopher L. Shannon (cshannon) 0f492f3b4b https://issues.apache.org/jira/browse/AMQ-5356
Migrated to Karaf 4.  This was required to support Jetty 9.2.x.
Fixed all OSGi unit tests.
2015-09-03 12:42:22 +00:00
gtully ae9af4b8b2 https://issues.apache.org/jira/browse/AMQ-5951 - ensure failover oneway won't retry if reconnect will not happen 2015-08-31 15:55:44 +01:00
gtully 1ea289736b https://issues.apache.org/jira/browse/AMQ-5943 - rename resources so that they don't match the surefire *Test* filter which will try to execute them as tests 2015-08-27 11:10:08 +01:00
Dejan Bosanac ee54f09303 https://issues.apache.org/jira/browse/AMQ-5831 - revisit topic subscriptions 2015-08-26 12:28:39 +02:00
gtully 10a74ce737 https://issues.apache.org/jira/browse/AMQ-5943 - patch, with test, applied with thanks to Torsten Mielke 2015-08-25 12:07:02 +01:00
gtully 11579bb918 https://issues.apache.org/jira/browse/AMQ-5938 - add remove(messageId) op to offline durable subs jmx view 2015-08-21 13:17:09 +01:00
Timothy Bish 3f5cfcf6de https://issues.apache.org/jira/browse/AMQ-2174
Add a test case.
2015-08-20 14:52:06 -04:00
gtully 3c2ed9352b AMQ-5933 - add test and fix 2015-08-19 15:02:41 +01:00
gtully ffdaeb2bd1 AMQ-5920 - make using a vt transaction configurable, a transaction negates concurrentstoreanddispatch and imposes local 2pc on mKahadb so needs to be off by default 2015-08-17 15:35:36 +01:00
Christopher L. Shannon (cshannon) e14aca871c https://issues.apache.org/jira/browse/AMQ-5889
-Cleaned up missing license headers and refactored packages.
-Added configuration options for a protocol detection timeout and
for the max number of connections accepted at the same time.
-Fixed a regression with connection counts
-Also added some more tests
2015-08-13 14:41:29 +00:00
gtully e5a94bfee2 https://issues.apache.org/jira/browse/AMQ-5794 - duplex network case calls start twice and would start a connect check timer in error. Fix is to only start connectiontimeout if we have not already started the rest of the monitoring 2015-08-12 16:07:34 +01:00
Christopher L. Shannon (cshannon) 04ee70a161 https://issues.apache.org/jira/browse/AMQ-5889
Adding support for auto detection of wire protocols over a transport.
OpenWire, AMQP, STOMP, and MQTT can all be detected and the broker
will properly handle each one over a given Transport.  Currently
auto TCP, NIO, SSL, and NIO+SSL transports can handle auto-detection
of the wire format and client but support could be added in the
future for other transports like websockets.
2015-08-11 19:39:29 +00:00
Timothy Bish 6cdd750ddc [maven-release-plugin] prepare for next development iteration 2015-08-10 11:04:26 -04:00
Timothy Bish a9eeb03520 [maven-release-plugin] prepare release activemq-5.12.0 2015-08-10 11:04:17 -04:00
Christopher L. Shannon (cshannon) a49d46e3ca https://issues.apache.org/jira/browse/AMQ-5748
Updating MemoryTopicMessageStore to decrement store statistics on cache
eviction.  Updating KahaDBMessageStoreSizeStatTest to account for the
fact that a LRU cache is used so the last 100 messages are kept in
memroy.
2015-08-08 17:59:19 +00:00
Christopher L. Shannon (cshannon) de24980a62 AMQ-5748 - Fixing MessageStore cache
This fixes KahaDBStore to properly check for an existing MessageStore
in the cache before creating a new one.  This will prevent potential
issues with metrics.
2015-08-07 17:23:25 +00:00
Timothy Bish 41ee3ec8de https://issues.apache.org/jira/browse/AMQ-5921
Add back support for type void and test.
2015-08-07 11:00:44 -04:00
Timothy Bish 70ef9b7e37 Increase the test timeout, passes locally if given enough time. 2015-08-06 14:52:40 -04:00
gtully 340728f2d1 AMQ-5920 - use implicit broker transaction for virtual topic fanout and add concurrentSend=true option to use an executor to fanout. Combination gives a 3x reduction in fanout roundtrip for small persistent messages to 100 consumer queues 2015-08-06 11:56:47 +01:00
Timothy Bish 50604ad932 Update RAT plugin to use latest version, add exclusions for eclipse
settins files and the KahaDB data folders created during most test runs.
Add missing headers to a couple files.
2015-08-05 13:08:15 -04:00
Timothy Bish ff9aae69f9 https://issues.apache.org/jira/browse/AMQ-5876
Add missing license headers to the properties files.
2015-08-05 11:38:54 -04:00
Timothy Bish 82e3ce805e https://issues.apache.org/jira/browse/AMQ-5916
Apply patch from Ganesh Murthy to resolve issue of creation of durable
subscriber fails via broker AdminView due to lack of SecurityContext on
ConnectionContext
2015-08-04 14:51:15 -04:00
Timothy Bish 3348ade99b https://issues.apache.org/jira/browse/AMQ-5914
Ensure a new pull request is sent, adds test.
2015-08-03 14:41:56 -04:00
Timothy Bish b84413a314 https://issues.apache.org/jira/browse/AMQ-5907
recompute the timeout value and send a new pull request if the message
received exceeds the configure redelivery maximum.
2015-07-30 17:17:55 -04:00
gtully 0b86397784 add browseAsTable verification to offline durable sub mbean 2015-07-29 17:05:07 +01:00
Christian Posta f4f416a093 Added a test for browsing offline durable subscriber sub 2015-07-20 09:00:13 -07:00
Christopher L. Shannon (cshannon) 2117768e0a https://issues.apache.org/jira/browse/AMQ-5875
Fixing a regression that caused a network bridge to recreate durable
demand improperly.
2015-07-17 16:34:06 +01:00
gtully e0c2c177c2 give test more time, was teetering on the limit locally with some builds 2015-07-17 13:40:33 +01:00
gtully 7c116631b5 AMQ-5266 - fix leak in transaction context - completions were not cleared on close/commit 2015-07-17 12:31:29 +01:00
Timothy Bish b9b27b968b https://issues.apache.org/jira/browse/AMQ-5893
Ensure that unacknowledged messages are removed from the Audit so they
are able to be redelivered to another consumer on this connection
2015-07-16 10:46:11 -04:00
gtully b1ea29ed14 AMQ-5892 - remove default stack trace from service warn to debug level on async error; makes it consistent with transport logging 2015-07-16 15:18:23 +01:00
gtully 2b5b890db9 AMQ-5888 add patch from GMURTHY with thanks - fix and test 2015-07-16 11:53:12 +01:00
Timothy Bish 39a1e04554 Ensure that the test has it's own data dir so it doesn't stumble into
the KahaDB store from some other test.
2015-07-10 09:38:22 -04:00
Timothy Bish 257a79de07 https://issues.apache.org/jira/browse/AMQ-5621
Remove reliance on fixed ports.
2015-07-09 15:18:53 -04:00
Timothy Bish 21c3ba3582 https://issues.apache.org/jira/browse/AMQ-5621
Clean up some warning, remove System.out calls, remove references to
static ports.
2015-07-09 13:52:30 -04:00
Christopher L. Shannon (cshannon) f10aab6428 https://issues.apache.org/jira/browse/AMQ-5851
resolves #123

This commit resolves an issue where unmatched acknowledgement
messages could be received when running a MDB consumer and
sending messages with a short TTL.  The expiration logic when
receiveing an expired Message Ack will now only expire messages
in dispatch relating to the received ack, not all expired messages
in the dispatch list.
2015-07-09 16:46:21 +01:00
Timothy Bish c9c32e5dc9 Fix test failure in CI 2015-07-09 11:09:26 -04:00
gtully a05a9a2129 https://issues.apache.org/jira/browse/AMQ-5552 - added profile for activemq.tests=smoke to run a fast subset of tests that gives a fast verification of a full build 2015-07-09 14:10:38 +01:00
gtully 802e968f93 fix deprecated import warn 2015-07-09 13:39:33 +01:00
Dejan Bosanac 52e4527125 https://issues.apache.org/jira/browse/AMQ-5368 - improve nio ssl handshake performance 2015-07-09 12:53:58 +02:00
gtully 3985e7225f https://issues.apache.org/jira/browse/AMQ-5853 - fix cacheEnabled case - additional test and fix for both jdbc and kahadb stores 2015-07-09 10:30:54 +01:00
Timothy Bish 13044decce https://issues.apache.org/jira/browse/AMQ-5848
Use the latest openwire version marshallers in the KahaDB store when
starting from a clean install, drop back to the version used in the
existing store if one is found.
2015-07-08 17:29:32 -04:00
Christopher L. Shannon (cshannon) 73d1bcd7ac https://issues.apache.org/jira/browse/AMQ-5875
Resolves an issue when using mKahaDB that caused a MessageStore
being used by more than one destination to be deleted even though
there was still at least 1 other destination using the store.
2015-07-08 18:32:15 +00:00
Christopher L. Shannon (cshannon) 8871b0e496 https://issues.apache.org/jira/browse/AMQ-5748
Fixing an issue that prevented old versions of KahaDB from being
upgraded to the newest version 6
2015-07-08 16:10:11 +00:00
gtully 59cd018979 https://issues.apache.org/jira/browse/AMQ-5876 - refactor properties loading such that it can be reused by cert and props login modules. Both loading on start and refreshing if reload=true and lastMod indicates change 2015-07-08 12:07:04 +01:00
Christopher L. Shannon (cshannon) 46055034c9 https://issues.apache.org/jira/browse/AMQ-5837
This commit adds an Inflight message size statistic to SubscriptionStatistics
so we can know the size of all the messages that are inflight, besides just the count.
2015-07-07 16:33:58 -04:00
Christopher L. Shannon (cshannon) 785b16bf9e https://issues.apache.org/jira/browse/AMQ-5748
Added a getMessageSize method to MessageStore to support retrieving the
total message size of all stored messages for a destination.  Added a
new storeMessageSize statistic to DestinationStatistics.
2015-07-07 18:03:27 +00:00
Timothy Bish 7a68ad5d98 https://issues.apache.org/jira/browse/AMQ-4814
Remove of a durable subscription when the keepDurableSubActive flag is
true (default) did not actually stop and cleanup the still active cursor
due to the fact that the cursor checks the flag of its subscription to
see if it should stay active when its stop method is called.  The
subscription needs to disable that flag when the subscription is being
removed so that the cursor will correctly shutdown.
2015-07-06 18:21:20 -04:00
Timothy Bish c38a61d7ae https://issues.apache.org/jira/browse/AMQ-5340
Clean up a bit, extend test timeout to account for slow CI machines,
remove System prints and replace with LOG.
2015-07-06 16:47:58 -04:00
Christopher L. Shannon 174dcbff2a https://issues.apache.org/jira/browse/AMQ-5340
A QueueBrowser no longer checks expiry on messages to prevent a
browser from hanging in between the hasMoreElements check and actually
getting a message.  This means that if messages were in the queue when
the browser started it will receive messages even if they are now
expired. Even though the browser will get the expired message, the
broker will still expire it to prevent future access to it.

Thanks to Henno Vermeulen for providing a test case.
2015-07-06 16:13:52 -04:00
gtully a2697b844e https://issues.apache.org/jira/browse/AMQ-5853 - track per priority sequence on load from the store. Allow db to select from entire prority 0-9 range. fix and additonal test 2015-07-06 15:32:23 +01:00
gtully b78ef954d2 https://issues.apache.org/jira/browse/AMQ-5853 - fix typo in test combination - ensures expiry does not kick in 2015-07-03 12:18:13 +01:00
gtully eece28ac75 https://issues.apache.org/jira/browse/AMQ-5853 - rework fix, have store reset tracked recovered priority when higer priority messages are stored. Additional perf fix that removes unnecessary 2x multiplier on db fetch size; seems periodic message expiry was throwing some tests when the cache was enabled 2015-07-03 10:30:16 +01:00
gtully fef8cac05f Add sanity check of browse list 2015-07-03 10:30:16 +01:00
Timothy Bish e4af2eb635 https://issues.apache.org/jira/browse/AMQ-5814
Use the context of the subscription when the producer adds a destination
that matches its wildcard.
2015-07-02 11:36:53 -04:00
Timothy Bish 0c72e5d7dc Fix test name to match its issue: AMQ-5822 2015-07-01 18:00:43 -04:00
Timothy Bish 60ca85c92b Find a free port instead of assuming the local port is free. Should
address CI failure.
2015-07-01 16:54:09 -04:00
gtully bbf288b12c https://issues.apache.org/jira/browse/AMQ-5639 - fix regression in NetworkRouteTest eashmock test 2015-06-29 12:10:31 +01:00
gtully 002ade79b0 https://issues.apache.org/jira/browse/AMQ-5639 - the duplex case needed work. All advisories were being acked async in duplex mode, that code needed to be more selective to forward advisories that dont terminate at the bridge. Fix and test 2015-06-26 14:54:29 +01:00
Dejan Bosanac 13c471cc11 https://issues.apache.org/jira/browse/AMQ-5656 - add support for selective mbean suppression; refactor a bit so we can support patterns and wildcards 2015-06-26 12:56:37 +02:00
gtully 2c53dbcc63 https://issues.apache.org/jira/browse/AMQ-5864 - fix and test. A replayed update command did not check if already updated 2015-06-25 15:53:45 +01:00
gtully b6fea83126 https://issues.apache.org/jira/browse/AMQ-5863 - fix and test - sequenceId state in messageid needs to be cleared before doing a store 2015-06-25 12:49:52 +01:00
gtully 37c46b9b42 https://issues.apache.org/jira/browse/AMQ-5705 - fix test regression. Make PublishedAddressPolicy vm scheme aware so such that is won't attempt a transform 2015-06-23 11:25:43 +01:00
gtully f2a335c27d https://issues.apache.org/jira/browse/AMQ-5853 - fix and test, statement was not configurable from xml also so there is no workaround. 2015-06-19 16:08:54 +01:00
gtully 1a3ade0414 fix intermittent failure - wait rather than sleep which also speeds up the test run 2015-06-19 12:36:32 +01:00
gtully b22184ebf6 fix intermittent failure with thread accounting test VmTransportNetworkBrokerTest, it did not lie. ci 2015-06-19 12:36:32 +01:00
gtully da3174cf98 ensure data dir is empty for test as derby needs clean dir 2015-06-19 12:36:32 +01:00
gtully e3a72cfa1d add sanity test for masterslave scheme for networkconnectors 2015-06-19 12:36:32 +01:00
Timothy Bish 833d30837b https://issues.apache.org/jira/browse/AMQ-5848
Introduce OpenWire v11 which adds noLocal to the SubscriptionInfo, if
configured KahaDB can store that version and the noLocal value is
recovered from the store.
2015-06-18 14:25:07 -04:00
Christopher L. Shannon (cshannon) b40dc4cc54 https://issues.apache.org/jira/browse/AMQ-5668
This commit fixes a race condition in AbstractStoreCursor setLastCacheId that could
cause a null pointer exception in certain cases.
2015-06-17 19:09:53 -04:00
Christopher L. Shannon (cshannon) fc3e026122 https://issues.apache.org/jira/browse/AMQ-5705
Modifing the AdivsoryBroker to set the originBrokerURL to the transport connector's
URL if it has been set versus using a default URL.
2015-06-17 17:47:24 +00:00
gtully 428fc82c8c AMQ5266Test can take 8mins locally - exclude from quick tests 2015-06-17 15:04:29 +01:00