Commit Graph

670 Commits

Author SHA1 Message Date
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
gtully d5c25c027b disable periodic expiry b/c that will page in and effect the usage assertions if the test lasts for more than 30s. read ci 2015-06-17 14:33:32 +01:00
gtully 38f7857533 bring some more consistency to derby usage and log nested exceptions on create failure 2015-06-17 14:30:25 +01:00
gtully 6cf9a8a9a5 ci disks seem to be really slow on force, increasing timeout and decreasing load on this test 2015-06-17 14:30:25 +01:00
Christopher L. Shannon (cshannon) edacc2a840 https://issues.apache.org/jira/browse/AMQ-5843
Adding a new property on PolicyEntry called includeBodyForAdvisory which will
include the original message body when sending advisory messages that include
the original message, instead of clearing it out.  This is turned off by
default.
2015-06-16 12:48:38 -04:00
Timothy Bish 540d8c7079 Turn off expired message processing during this test, the browse for
expired message can trip the limits that this test expects to end up
with which is not what is being tested here.
2015-06-16 12:35:17 -04:00
gtully ffef4dc5fa https://issues.apache.org/jira/browse/AMQ-5844 - patch and test applied with thanks to Ganesh Murthy - ganeshmurthy 2015-06-16 15:54:11 +01:00
gtully 1b08858a37 reduce test duration - v.slow for 60k messages of size 30k -resuce to ~30s b/c it was excceeding 10mins - large linear work load not great for leveldb 2015-06-16 15:04:13 +01:00
Timothy Bish 33fb7c6096 https://issues.apache.org/jira/browse/AMQ-5621
Have the test store its data in the target folder to let the clean step
remove it and attempt to remove the data folder between runs to avoid
state derby instances.
2015-06-15 10:18:28 -04:00
Christopher L. Shannon (cshannon) 61fd811adc https://issues.apache.org/jira/browse/AMQ-5393
Adding a property called schedulePeriodForDiskUsageCheck which can be set
to a time period to periodically check disk usage limits and adjust if
the amount of disk space has been reduced.
2015-06-12 10:35:20 -04:00
Timothy Bish ce16735bb0 Test needs more wait time on redelivery check since the initial
redelivery delay is 4 seconds and the sleep was only 3s + 500ms receive.
2015-06-10 18:21:31 -04:00
gtully 3100909041 https://issues.apache.org/jira/browse/AMQ-5830 - ensure duplex inbound connection sets network=true flag, fix and test 2015-06-09 12:19:49 +01:00
Christopher L. Shannon (cshannon) 886e2d4d97 Adding a configuration option to PolicyEntry to enable setting the maximum number of created destinations by policy on the broker.
This resolves https://issues.apache.org/jira/browse/AMQ-5751
2015-06-08 16:00:08 -04:00
Timothy Bish eaf5c12151 Add test to assert that preconditions are met before moving on to the
rest of the checks.
2015-06-08 14:11:24 -04:00
Andy Taylor 67c28b1c68 https://issues.jboss.org/browse/ENTMQ-780
A couple of tests to add to the patch provided
2015-06-08 15:53:48 +01:00
Christopher L. Shannon (cshannon) ea03bb1f8c https://issues.apache.org/jira/browse/AMQ-5813
Fixing countBeforeFull for TopicSubscriptions to report a positive value
2015-06-05 14:08:15 -04:00
Timothy Bish a095e9b9dd https://issues.apache.org/jira/browse/AMQ-5310
Adding tests that validate the code follows the JMS Spec expectations
for behavior of closed consumers and producers.
2015-06-04 17:05:59 -04:00
gtully 928e815a02 https://issues.apache.org/jira/browse/AMQ-5656 - add support for selective mbean suppression based on objectName attribute match. Avoids mbeanserver contention on systems where producer/consumers/dests are dynamic 2015-06-04 14:27:18 +01:00
Timothy Bish 73d2810c60 Test does not need JMX so disable to avoid clashing with brokers left
running by other tests.
2015-06-03 13:38:01 -04:00
Timothy Bish 848adc4b5d https://issues.apache.org/jira/browse/AMQ-5822
Update the receive counter on reads to avoid dropping connections
wrongly.
2015-06-03 10:10:48 -04:00
mfrazier dcc7b11347 AMQ-5713 - making accessors public to remove startup error.
Includes unit test DestinationBridgeAccessorsTest which replicated the problem and now passes.
2015-05-29 16:13:41 -07:00
Christopher L. Shannon (cshannon) eece576b19 https://issues.apache.org/jira/browse/AMQ-5792
Adding SubscriptionStatistics to group together all metrics in a bean
for a subscription.
2015-05-28 15:47:30 -04:00
Timothy Bish 2518ab2802 Fix test failure in CI due to fixed port being in use. 2015-05-26 13:23:19 -04:00
Timothy Bish 3125caee5b https://issues.apache.org/jira/browse/AMQ-5794
implement transport.connectAttemptTimeout option across the transports
fro OpenWire, STOMP, AMQP and MQTT and add tests to cover.
2015-05-26 12:29:23 -04:00
gtully 9bc602be43 https://issues.apache.org/jira/browse/AMQ-4705 - close window where both master and slave can be active - slave waits for possible keepAlivePeriod with the lock before startin. Ensures a keepAlive has completed on the master 2015-05-22 11:40:40 +01:00
gtully 5ee9a3426f https://issues.apache.org/jira/browse/AMQ-5791 - apply patch from Vladimír Čaniga with thanks 2015-05-21 15:53:40 +01:00
gtully c07d6c841d https://issues.apache.org/jira/browse/AMQ-4842 - the store needed to be shared between master and slave 2015-05-20 13:42:49 +01:00
gtully 9ad65c62ed https://issues.apache.org/jira/browse/AMQ-5164 https://issues.apache.org/jira/browse/AMQ-4842 - master slave advisory needed to wait for failover reconnect - exponential backoff was sometimes giving to long a delay. Retroactive override needs to applied after policies. Tests reinstated 2015-05-20 09:57:05 +01:00
gtully baa10ed33e more derby shutdown woes resolved 2015-05-20 09:57:05 +01:00
gtully 3fdf9861b2 https://issues.apache.org/jira/browse/AMQ-5783 - properly remove free topic from the store when there are no remaining subs. Issue: release of the index but remaining metadata refs to the old state. Mbean was also left dangling. test thanks to pat fox 2015-05-20 09:57:05 +01:00
gtully 17f4f349f3 more tidy up of derby usage in tests to ensure proper cleanup; ci failures 2015-05-20 09:57:05 +01:00
gtully 2536c03125 fix sync on failover updated urls - intermittent failure on FailoverComplexClusterTest 2015-05-20 09:57:05 +01:00
gtully 6f1f06fb16 tidy up derby usage - thread safe creation/shutdown to avoid derby failures and db creation/shutdown sql exceptions that leave db dir in inconsistent state 2015-05-15 14:06:04 +01:00
gtully 5e36f65e0e https://issues.apache.org/jira/browse/AMQ-4705 - lastmod granualarity is second on some nix. Also write on lock acquire to ensure modification time change 2015-05-15 13:23:12 +01:00
gtully 4c8a4722a1 remove some dead code in tests 2015-05-15 12:21:28 +01:00
gtully ed1622dd34 harden to address intermittent ci failure 2015-05-15 12:21:28 +01:00
gtully fee7c1cf4c https://issues.apache.org/jira/browse/AMQ-4705 - harden test - ensure existance before attempted mod 2015-05-13 16:30:06 +01:00
gtully b8a20e9ef6 skipped first dispatch on vmtransport needed a better test - reworked to avoid busy loop on full and ensured sync on started for enqueue. Sort FailoverStaticNetworkTest and NetworkOfTwentyBrokersTest intermittent failures 2015-05-13 13:56:24 +01:00
gtully ccbbecb4a4 https://issues.apache.org/jira/browse/AMQ-4705 - apply patch from ganesh murthy with thanks. Fix and test making use of last modified to track deletion and recreation events 2015-05-12 23:19:07 +01:00
gtully c89bb7a316 fix intermittent failure of FailoverStaticNetworkTest. Bridge fails to start triggerStartAsyncNetworkBridgeCreation thread waiting on localBrokerInfo. The command was dropped due to contention between dispatch and peer start. Fix and test. Relates to https://issues.apache.org/jira/browse/AMQ-3684 2015-05-12 22:10:57 +01:00
gtully 3ef5389691 https://issues.apache.org/jira/browse/AMQ-4897 - rework with test that shows the blocking inactivity monitor task. Removed some redundant state 2015-05-12 22:10:57 +01:00
gtully d467220085 add some more logging if tests fails 2015-05-12 22:10:56 +01:00
gtully 1359e8eae2 https://issues.apache.org/jira/browse/AMQ-4068 fix intermittent test failure. Rework usage check to prevent additions to the store rather than blocking scheduled dispatch from the store 2015-05-08 14:14:25 +01:00
Timothy Bish 3bfffca9c9 https://issues.apache.org/jira/browse/AMQ-5621 2015-05-07 18:42:11 -04:00
Timothy Bish c10e6fa8f0 https://issues.apache.org/jira/browse/AMQ-5621
Convert to JUnit 4 while fixing sporadic failure due to the expiry
setting being left at default of 30 seconds, which on a fast machine
means the expiry tests sometime finish before the task kicks in.
2015-05-07 18:31:00 -04:00
gtully 82200b6e70 add test case for https://issues.apache.org/jira/browse/AMQ-5752 - fix needs some thought 2015-04-30 16:19:57 +01:00
Timothy Bish 9ef4259297 https://issues.apache.org/jira/browse/AMQ-5616
Use ConcurrentMap in declarations
2015-04-28 11:15:08 -04:00
gtully bcdf770c10 ensure embedded jdbc is shutdown 2015-04-28 12:42:21 +01:00
gtully 81b8403f33 https://issues.apache.org/jira/browse/AMQ-5744 - fix up test refs to old spring jasypt 2015-04-28 12:33:29 +01:00
gtully c129051175 https://issues.apache.org/jira/browse/AMQ-5746 - separate out start from creation of scheduler store. test via Martyn Taylor with thanks. This closes #80 2015-04-27 16:16:49 +01:00
gtully 23ecbe80d0 https://issues.apache.org/jira/browse/AMQ-5743 - confine logging to the jmx purge op 2015-04-24 13:35:02 +01:00
Dejan Bosanac b8698953f3 https://issues.apache.org/jira/browse/AMQ-5744 - jasypt-spring31 2015-04-24 11:56:26 +02:00
gtully ac635ddf1d trap potential exception on abortive close 2015-04-23 13:25:39 +01:00
gtully 165959e250 tidy up a bunch of jdbc test cases to ensure embedded derby is shutdown 2015-04-23 13:12:49 +01:00
gtully 971ff0dd9e https://issues.apache.org/jira/browse/AMQ-5542 - test that shows retaining of data files due to ack file map and the need for mKahadb if there are low limits and serial usage - test has been hanging since the fix 2015-04-23 13:10:47 +01:00
gtully eb6c082631 https://issues.apache.org/jira/browse/AMQ-5735 - fix up semantics around lastDeliveredSequenceId 2015-04-22 16:32:17 +01:00
Timothy Bish a0835c2c21 https://issues.apache.org/jira/browse/AMQ-5371
Move option ignoreNetworkConsumers up to base AbortSlowConsumerStrategy
so it can be used for both the original version and the slow ack aware
version.
2015-04-20 15:20:33 -04:00
Martyn Taylor a65ac586c2 https://issues.apache.org/jira/browse/AMQ-5729 - Do not log passwords on MBean method calls.
Previous to this patch the AnnotatedMBean class would simply dump
any arguments passed in via JMX call to the log (when audit is enabled).
Method parameters can sometimes contain sensitive information such as
the password field on QueueView.sendTextMessage.

This patch adds a @Sensitive annotation to the JMX module allowing
implementations of MBean interfaces to mark method parameters as sensitive
preventing values from being logged.
2015-04-20 18:06:45 +01:00
Timothy Bish 514496eba9 https://issues.apache.org/jira/browse/AMQ-5621
Fix test not using the parameterized delivery mode value but using
Session.AUTOACKNOWLEDGE as the delivery mode value instead.
2015-04-20 12:40:42 -04:00
Christian Posta 01f56d0ca2 unit tests for https://issues.apache.org/jira/browse/AMQ-5153 LevelDB does not store subscribedDestination for durable subscriptions 2015-04-20 07:46:41 -07:00
gtully 7dc522d4c3 remove timing depdendency 2015-04-16 15:25:58 +01:00
Timothy Bish ec9a92f6fc https://issues.apache.org/jira/browse/AMQ-5649
Ensures that max producers on a connection includes anonymous producers
in its count, based on patch from: Christopher L. Shannon (cshannon)
<christopher.l.shannon@gmail.com>

Merged the test into the existing ConfigTest that validates the max
producers functionality.
2015-04-13 10:25:51 -04:00
Dejan Bosanac 2562cf21a2 https://issues.apache.org/jira/browse/AMQ-5718 - don't add messages to subscriber while it's discarding 2015-04-13 11:16:55 +02:00
gtully b29eb384b8 https://issues.apache.org/jira/browse/AMQ-5710 - rework fix to resolve some unit test regressions, change now confined to rar usecase 2015-04-09 16:50:14 +01:00
Clebert Suconic ab8f54b066 fixing a race on SharedLockFile 2015-04-08 11:17:00 -04:00
Clebert Suconic f2837bac03 fixing a small test leak
TearDown is supposed to remove the getRootLogger(), at the same place it was added.
This appender was living the entire life cycle of the JVM after this test.
2015-04-08 10:33:42 -04:00
Clebert Suconic 0a161380f8 AMQ-5709 Fixing tests
https://issues.apache.org/jira/browse/AMQ-5709

This is just fixing a test properly
2015-04-08 10:28:42 -04:00