Commit Graph

138 Commits

Author SHA1 Message Date
Timothy A. Bish 37ede54486 some fixes for: https://issues.apache.org/jira/browse/AMQ-4487
Allow the maxProducersToAudit value to be set of Queue and QueueBrowser subscriptions which can help to workaround OOM errors on QueueBrowsers when there are more than the max number of producers audited.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1489180 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 21:12:44 +00:00
Hiram R. Chirino ec9975c36e Additional fixes related to AMQ-4563: You can now configure the storeOpenWireVersion property of a broker to control which version of openwire is used by the persistence stores. This needs to be set to version 10 to preserve the original AMQP message ids.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1488375 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 19:56:03 +00:00
Timothy A. Bish a3060d0c7d fixes for: https://issues.apache.org/jira/browse/AMQ-4555
Only create update thread on demand. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486074 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 14:27:08 +00:00
Timothy A. Bish 02a58c2a34 fixes for: https://issues.apache.org/jira/browse/AMQ-4555
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486063 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 14:10:23 +00:00
Bosanac Dejan 620523a597 https://issues.apache.org/jira/browse/AMQ-4000 - initial implementation of keeping track of durable subscribers over network and unregister them appropriately
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483827 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 14:27:48 +00:00
Gary Tully 3ded22df3d https://issues.apache.org/jira/browse/AMQ-4540 - wait for a max of 30 seconds for pending forwards to complete
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483605 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 23:32:31 +00:00
Gary Tully 6f124c16f7 https://issues.apache.org/jira/browse/AMQ-4539 - add JMSActiveMQBrokerPath string property and brokerPath attribute via jmx message view, the list length is the current number of network hops
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483600 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 23:03:17 +00:00
Timothy A. Bish f46b184f6c fix and test for: https://issues.apache.org/jira/browse/AMQ-4413
For durable subscriptions the PrefetchSubscription can't drop messages in dispatchPending otherwise they are never added back into the pending cursor. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483111 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 22:22:39 +00:00
Hiram R. Chirino 5a192e790d Adding a Promise class that can allow us to use callbacks to get future computation results.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482954 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 16:59:50 +00:00
Hiram R. Chirino c5788d24bc Reduce the amount of work done while the sendLock is acquired.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482805 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 13:11:07 +00:00
Hiram R. Chirino 548c19496c reduce the number of times the sendSyncs map is accessed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482800 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 13:02:27 +00:00
Hiram R. Chirino 0deda2501d Fixing regression in last commit.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482794 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:44:13 +00:00
Bosanac Dejan e06685fe81 https://issues.apache.org/jira/browse/AMQ-4000 - as part of this feature we need to properly send advisories when durable sub unregisters
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482790 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:31:09 +00:00
Hiram R. Chirino 8461158178 Fixes AMQ-4535: Activemq configured with leveldb commit fail when accessed by PutGet from IBM Perf Harness
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482789 13f79535-47bb-0310-9956-ffa450edef68
2013-05-15 12:30:45 +00:00
Gary Tully 58b9a83fe8 https://issues.apache.org/jira/browse/AMQ-4532 - fix and test - ensure disposed exception is propagated to clients on vm server shutdown
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482117 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 21:43:39 +00:00
Timothy A. Bish 2bd0e5703e apply fix and patch for: https://issues.apache.org/jira/browse/AMQ-4530
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481930 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 15:36:03 +00:00
Timothy A. Bish b820ac2bf9 fix for: https://issues.apache.org/jira/browse/AMQ-4512
Usage and MemoryUsage sync fixes to keep state consistent during thread contention.  Test case added.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481106 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 17:13:48 +00:00
Timothy A. Bish 540b1c6a89 fix for: https://issues.apache.org/jira/browse/AMQ-4518
Allow purge to disable message expiration check when paging in Messages to be purged.  Avoids attempts at sending messages to a DLQ during a purge operation and in firing advisory messages for expired messages which are being thrown out by request. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480731 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 17:50:26 +00:00
Hiram R. Chirino 4a16c1ff27 Implements AMQ-4526: ActiveMQ should automatically restart if a Locker looses it's lock.
* Adds a new broker config option 'restartAllowed'.  Set it to false to revert to the preserve behavior.
* Adds a new 'restart' JMX operation on the broker
* The default IO exception handler will trigger a broker restart instead of a broker stop.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480325 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 15:34:00 +00:00
Bosanac Dejan fc8c8d339e https://issues.apache.org/jira/browse/AMQ-4522 - set timeToLive when sending a message using JMX
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480189 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 09:15:17 +00:00
Timothy A. Bish ff9b80040b fix for: https://issues.apache.org/jira/browse/AMQ-4520
Load BouncyCastle if present in lib dir.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480117 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 22:08:28 +00:00
Timothy A. Bish 0bb9013769 Fix for: https://issues.apache.org/jira/browse/AMQ-4517
Don't send MessageDLQd advisory for Message that aren't sent to a DLQ

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1480087 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 21:17:34 +00:00
Timothy A. Bish d7aaca5034 Fix and test for: https://issues.apache.org/jira/browse/AMQ-4513
Makes the locking in RegionBroker a bit more fine grained.  We hold a lock only for a short time and allow destination adds that aren't on the same destination to continue on concurrently.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1479963 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 16:13:18 +00:00
Christian Posta 866440dfb2 Fix for https://issues.apache.org/jira/browse/AMQ-4516 - Don't decrement topic enqueues when messages are expired
Removed the call to decrement the counters, and added unit test

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1479925 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 14:39:25 +00:00
Timothy A. Bish 3a8eb74a9f Fix and test for: https://issues.apache.org/jira/browse/AMQ-4505
When a broker was stopping it was sending out a cluster update after tearing down its bridges so any client connected to it would lose its awareness of other brokers in the cluster. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478835 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 15:21:25 +00:00
Bosanac Dejan 7450a32ae7 https://issues.apache.org/jira/browse/AMQ-4495 - always get a max batch of messages from the store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478823 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 14:50:56 +00:00
Gary Tully 4742c7d86f https://issues.apache.org/jira/browse/AMQ-4504 - ensure all dests in a composite get a chance to dispatch to a consumer after an ack
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478183 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 20:49:08 +00:00
Bosanac Dejan 5cbb4bfc12 https://issues.apache.org/jira/browse/AMQ-4467 - cursor memory usage when pfc is off
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1477574 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 11:44:03 +00:00
Timothy A. Bish 3039b67cb2 fix for: https://issues.apache.org/jira/browse/AMQ-4351
Ensure the destination statistics are updated on durable sub deactivate. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1476433 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 22:51:50 +00:00
Gary Tully 66e8011e9e https://issues.apache.org/jira/browse/AMQ-4485 - ensure cursor updates in same order as store orderindex via beforeCompletion with index lock. The before completion tracks ordered work that first thread completes as a unit. All updates to a destination are combined to a single sync, such that there is no cursor contention between transactions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1475734 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 12:47:20 +00:00
Bosanac Dejan e1f170da6e https://issues.apache.org/jira/browse/AMQ-4483 - improve dlq managment
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1471420 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 14:01:16 +00:00
Timothy A. Bish 7e53814928 Fix and test for: https://issues.apache.org/jira/browse/AMQ-4475
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1469013 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 18:07:24 +00:00
Bosanac Dejan 15affd0755 https://issues.apache.org/jira/browse/AMQ-3706 - improve rebalance distribution which is more apparent when only two brokers are involved
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467241 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 11:52:15 +00:00
Timothy A. Bish 0054941a53 fix and test for: https://issues.apache.org/jira/browse/AMQ-4356
The actual Durable subscription wasn't getting removed from the Store so on restart they were recovered.  

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1464729 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 20:30:00 +00:00
Timothy A. Bish b52c371cd9 fix for: https://issues.apache.org/jira/browse/AMQ-4364
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1462210 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 16:36:57 +00:00
Gary Tully 78bedd605a https://issues.apache.org/jira/browse/AMQ-4408 - fix and test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1461362 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 22:56:16 +00:00
Bosanac Dejan 9c909b5975 https://issues.apache.org/jira/browse/AMQ-4406 - remoce command agent
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1461133 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 13:58:26 +00:00
Bosanac Dejan 2f469c1744 https://issues.apache.org/jira/browse/AMQ-3883 - refactoring to make authoriation module with arbitrary group class configuration easier
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1460766 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 17:08:58 +00:00
Bosanac Dejan 9027d49516 https://issues.apache.org/jira/browse/AMQ-3883 - allow arbitrary group principal class to be used by authorization map
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1459834 13f79535-47bb-0310-9956-ffa450edef68
2013-03-22 15:08:51 +00:00
Gary Tully 27c424ca19 https://issues.apache.org/jira/browse/AMQ-4369 - ensure default handler in place before transport connectors are started
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1455944 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 14:02:38 +00:00
Hiram R. Chirino 846cf7df3f Added at test case and fix for AMQ-4351.
Avoids deadlock by not holding on to the pending and dispatch locks when we try to detach a durable sub from a topic.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1455290 13f79535-47bb-0310-9956-ffa450edef68
2013-03-11 19:18:23 +00:00
Gary Tully fc15f130d1 https://issues.apache.org/jira/browse/AMQ-4362 - Broker-based redelivery plugin - support for maximumRedeliveries="-1"
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1454330 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 11:43:46 +00:00
Gary Tully ef1d254e34 AMQ-4122 - add log warning if lease will expire due to mal configuration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1450213 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 15:25:47 +00:00
Timothy A. Bish 8b3761c575 fix for: https://issues.apache.org/jira/browse/AMQ-4319
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1449797 13f79535-47bb-0310-9956-ffa450edef68
2013-02-25 18:24:20 +00:00
Timothy A. Bish d75e418c3d https://issues.apache.org/jira/browse/AMQ-4330
Merge back the isSlave() JMS API. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1449077 13f79535-47bb-0310-9956-ffa450edef68
2013-02-22 15:32:26 +00:00
Gary Tully 806ec21eb6 https://issues.apache.org/jira/browse/AMQ-4328 - AMQ3274Test, org.apache.activemq.usecases.NetworkBridgeProducerFlowControlTest - sync needs to be conditional
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1448809 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 21:26:17 +00:00
Gary Tully 56cfa302cf need a different fix for https://issues.apache.org/jira/browse/AMQ-4328 - AMQ3274Test failure, conflicts with org.apache.activemq.usecases.NetworkBridgeProducerFlowControlTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1448798 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 20:54:23 +00:00
Gary Tully def8c77c07 Revert "Fix for https://issues.apache.org/jira/browse/AMQ-4000 Durable subscription not getting unregistered on networked broker, thanks torsten for the unit test!"
added DurableSubInBrokerNetworkTest to broken test profile till we get this resolved.

This reverts commit b7c32d924a.

Conflicts:
	activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubInBrokerNetworkTest.java

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1448161 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 13:33:36 +00:00
Gary Tully f4bed15738 https://issues.apache.org/jira/browse/AMQ-4328 - regression in AMQ3274Test, need to sync demand sub creation on async vm transport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1447715 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 13:33:20 +00:00
Gary Tully f08a178c1d https://issues.apache.org/jira/browse/AMQ-4328 - fix and test. With a large backlog the flow can block when the vm transport is sync b/c the async requests can overlap with acks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1447323 13f79535-47bb-0310-9956-ffa450edef68
2013-02-18 15:27:26 +00:00