Commit Graph

2123 Commits

Author SHA1 Message Date
Robert Davies 158dbc66e7 go back to less granular synchronization
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492461 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 08:59:12 +00:00
Hiram R. Chirino 481fc1ee3a - Big refactor of the QuickJournal:
- Move it to it's own package org.apache.activemq.store.quick
  - Brought in all the latest JournalPersistenceAdaptor enhancements
  - It now uses the AsyncDataManager as the Journal implemenation which has better read performance
  - Instead of forcing all PersistenceAdaptors to support external references, we now move all the message reference methods to a new set of interface class (MesageReferenceAdaptor)
  - Enhanced a few Kaha container classes so that they take advantage of Generics
  - Added a Kaha based MesageReferenceAdaptor impementation
  - Strategy for deleting old journal log files is now in place so that disk space can be reclaimed.


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492380 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 01:48:20 +00:00
Hiram R. Chirino 0afb7f934f - Big refactor of the QuickJournal:
- Move it to it's own package org.apache.activemq.store.quick
  - Brought in all the latest JournalPersistenceAdaptor enhancements
  - It now uses the AsyncDataManager as the Journal implemenation which has better read performance
  - Instead of forcing all PersistenceAdaptors to support external references, we now move all the message reference methods to a new set of interface class (MesageReferenceAdaptor)
  - Enhanced a few Kaha container classes so that they take advantage of Generics
  - Added a Kaha based MesageReferenceAdaptor impementation
  - Strategy for deleting old journal log files is now in place so that disk space can be reclaimed.


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492373 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 00:57:03 +00:00
Hiram R. Chirino 207816b308 Fix test failures
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491857 13f79535-47bb-0310-9956-ffa450edef68
2007-01-02 17:26:32 +00:00
Robert Davies 61d56b290a in stop() remove VMTransports after services stopped - to avoid a timing issue with
discovery spinning up a new instance

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491856 13f79535-47bb-0310-9956-ffa450edef68
2007-01-02 17:13:54 +00:00
Robert Davies 81c5b1500b in stop() remove VMTransports after services stopped - to avoid a timing issue with
discovery spinning up a new instance

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491794 13f79535-47bb-0310-9956-ffa450edef68
2007-01-02 13:39:10 +00:00
Robert Davies 4cd0a27f91 Fix for https://issues.apache.org/activemq/browse/AMQ-1110
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491753 13f79535-47bb-0310-9956-ffa450edef68
2007-01-02 07:06:39 +00:00
Hiram R. Chirino 3070d33275 Wait the perfect amount of time by using count down latches.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491455 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 17:33:56 +00:00
Hiram R. Chirino a810f4300a Fix RecoveryBrokerTest that I messed up :)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491452 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 17:32:40 +00:00
Robert Davies b91103a830 sp mistake in log
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491432 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 15:36:43 +00:00
Robert Davies 6ddeac7bc0 check we are not a slaveBroker() when dispatching
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491431 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 15:35:38 +00:00
Hiram R. Chirino 7695676339 Fix for CursorDurableTest.
The TopicStorePrefetch was iterating items that were in the subscription but not added to the pending list.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491346 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 23:49:03 +00:00
Robert Davies 2a682e2fb2 Applied patch from: https://issues.apache.org/activemq/browse/AMQ-961
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491185 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 07:27:06 +00:00
Robert Davies 7351c4bd0d clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491184 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 07:25:03 +00:00
Robert Davies fe3f492321 fixed class cast exception
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491128 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 23:01:39 +00:00
Robert Davies 71e44ce436 put back using kaha as persistent adaptor
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491093 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:27:00 +00:00
Robert Davies 3d0191e29e clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491092 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:25:58 +00:00
Robert Davies 8bc7f8636c clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491090 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:24:11 +00:00
Robert Davies cd687e389c clear last batch id if no more messages left to dispatch to a durable subscriber
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491089 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:21:10 +00:00
Robert Davies 8b0f88a257 put the synchronization back for now
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491088 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:19:25 +00:00
Robert Davies d7a9feb0a6 Fix for http://issues.apache.org/activemq/browse/AMQ-1113
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490967 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 09:28:01 +00:00
Robert Davies d2e606208d Use the store based cursor by default for Queues - which will enable very large queue support
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490814 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:03:53 +00:00
Robert Davies 6964747912 updated recoverNextMessages()
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490813 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:02:44 +00:00
Robert Davies a70f96bd37 set the basedir property - so can be run from inside eclipse
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490808 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:01:21 +00:00
Robert Davies 63d78acccc tidy up the tests
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490807 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:00:36 +00:00
Robert Davies 81920f61cc setPersistent() call has no affect when using XBeanBrokerFactory - start is already called
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490805 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:00:05 +00:00
Robert Davies 17f8a7ebcc use memory based persistence for this test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490804 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:58:36 +00:00
Robert Davies 710e2fd8eb exclude TwoBrokerMulitcastQueueTest for now
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490802 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:58:00 +00:00
Robert Davies 5b33fefd41 persistent not used - but needs to be set in config - as only has affect before
start is called on the broker (which happens automatically via afterPropertiesSet())

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490800 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:57:17 +00:00
Robert Davies 974ec34df5 add a little more stress to the testManyProducersManyConsumers() test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490798 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:55:56 +00:00
Robert Davies e5efc58cd4 Added support for hasMessagesToDeliver() method
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490796 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:52:41 +00:00
Robert Davies 4a16f4527a Transactions, when recovered, need to be recovered in prepare order:
a)  order determined by an unsorted map iterator might confuse people
b) brokerSequence can get out of step for messages recovered then committed - e.g. 
recovery on startup

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490795 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:51:22 +00:00
Robert Davies b1c94aa00b Provide a more robust implementation, and one that deletes messages after they have been consumed
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490794 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:50:04 +00:00
Robert Davies 3093ea0f6e Transactions, when recovered, need to be recovered in prepare order:
a)  order determined by an unsorted map iterator might confuse people
b) brokerSequence can get out of step for messages recovered then committed - e.g. 
recovery on startup

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490792 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:48:04 +00:00
Robert Davies 27ded73ca6 drop synchronization from connectionState and connection context -
not required when using ConcurrentHashMap and limited concurrency for 
publishers or transactions for the same client connection 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490789 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:44:59 +00:00
Robert Davies bc03f37ebe Fix for http://issues.apache.org/activemq/browse/AMQ-841
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490786 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:29:34 +00:00
Robert Davies 63ec479423 forgot to remove the sophisticated debuging code - oops
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490454 13f79535-47bb-0310-9956-ffa450edef68
2006-12-27 07:43:43 +00:00
Robert Davies de64939643 somehow, somewhere, the ResponseCorrelator got dropped from the transport used by the
MasterBroker - so I've added it back here

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490452 13f79535-47bb-0310-9956-ffa450edef68
2006-12-27 07:40:13 +00:00
Robert Davies ef0b33eeb6 uses cases submitted by Brian Diesenhaus
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490319 13f79535-47bb-0310-9956-ffa450edef68
2006-12-26 16:14:14 +00:00
Robert Davies e6a418b13b check we don't through null pointer exceptions - as this can lead to stack overflows ...
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490174 13f79535-47bb-0310-9956-ffa450edef68
2006-12-25 21:05:57 +00:00
Robert Davies c651ace525 it's ensure dispatching happens in order
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490111 13f79535-47bb-0310-9956-ffa450edef68
2006-12-25 07:19:29 +00:00
Robert Davies d8674a0fed fix for http://issues.apache.org/activemq/browse/AMQ-1108
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490007 13f79535-47bb-0310-9956-ffa450edef68
2006-12-24 08:57:34 +00:00
Robert Davies 3be0113228 exclude QuickJournalXARecoveryBrokerTest
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@489769 13f79535-47bb-0310-9956-ffa450edef68
2006-12-22 21:22:42 +00:00
Guillaume Nodet 2550bc44b7 AMQ-1107: Upgrade to xbean 2.8 to fix invalid generated schemas
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@489665 13f79535-47bb-0310-9956-ffa450edef68
2006-12-22 14:41:05 +00:00
Adrian T. Co 2b903d446a Fix for AMQ-1106: PooledBrokerFactoryBean incorrectly compares broker config resources
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@489413 13f79535-47bb-0310-9956-ffa450edef68
2006-12-21 17:17:19 +00:00
Robert Davies 958c41a12b stop destinations when stoping a region
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@488958 13f79535-47bb-0310-9956-ffa450edef68
2006-12-20 08:33:50 +00:00
Robert Davies f6972ec84a remove println messages from remove()
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@488783 13f79535-47bb-0310-9956-ffa450edef68
2006-12-19 19:41:41 +00:00
James Strachan 419ed2ee91 Patch for AMQ-1093 to avoid a deadlock if the transport is being reconnected from inside a MessageListener which is calling a send(), lets make the explicit clear of the consumer dispatch list asynchronous and within the existing mutex
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487235 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 15:23:47 +00:00
Robert Davies e500f2ecc4 synchronize around the send on a Message
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487232 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 15:18:25 +00:00
Adrian T. Co 87d15d6b98 https://issues.apache.org/activemq/browse/AMQ-1097
- Fix for selector configured using destination options is not set
- Test case to demonstrate issue

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487187 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 12:25:49 +00:00