summaryrefslogtreecommitdiff
path: root/qpid/java/broker
Commit message (Collapse)AuthorAgeFilesLines
* QPID-1858: use the generated keystore by default Aidan Skinner2009-05-131-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@774543 13f79535-47bb-0310-9956-ffa450edef68
* Update line endings to be unix...might just be svn property issue though.Martin Ritchie2009-05-111-35/+35
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@773449 13f79535-47bb-0310-9956-ffa450edef68
* License Updates based on RAT outputMartin Ritchie2009-05-102-0/+37
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@773432 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1826: brown paper bag commitAidan Skinner2009-04-232-16/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@767990 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1826: Ensure that server-wide configuration variables in ↵Aidan Skinner2009-04-235-54/+298
| | | | | | virtualhosts.xml are honored. Add sample-flattened parse tree from M4 and test to ensure that values are parsed appropriately. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@767952 13f79535-47bb-0310-9956-ffa450edef68
* Eat IllegalArgumentException when creating the signal handler, fixes startup ↵Martin Ritchie2009-04-171-1/+9
| | | | | | | | | on Windows. merged from trunk r766025 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@766038 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1820: configure queues on creationMartin Ritchie2009-04-171-1/+1
| | | | | | | merged from trunk r766004 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@766024 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1807 : Copied the broker from trunk and update SlowMessageStore to use ↵Martin Ritchie2009-04-17369-0/+60551
| | | | | | | | | | | | MessageStores rather than TransactionLogs. Merge from trunk inlucding recent fixes This mirrors the change done in r764850 in bring the broker from 0.5-fix to trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@765984 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1807 : Remove old broker and FlowToDisk related testsMartin Ritchie2009-04-17390-64426/+0
| | | | | | | merged from trunk r764838 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@765982 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1800: only create the new empty arraylist after checking for a previous ↵Martin Ritchie2009-04-111-2/+5
| | | | | | | | | enqueue list, as it often wont be required merge from trunk r764113 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764151 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1800: remove unecessary addAll() command, as the list is about to be ↵Martin Ritchie2009-04-111-1/+1
| | | | | | | | | cloned we can simply use the original list merged from trunk r764105 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764150 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1800: modify SAMQQ to record transactionlog etry even when queue isnt ↵Martin Ritchie2009-04-112-9/+65
| | | | | | | | | | | durable(consistent with restof broker) and send both current and new queue to BTL for enqueue to ensure references are kept properly. Update BTL to check for prevous enqueues and record new enques in any existing list, despatching only new enqueues to the delegate merged from trunk r764075 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764148 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1793 : Update AMQChannel to remember any AMQException that occurs ↵Martin Ritchie2009-04-111-9/+28
| | | | | | | | | during requeue and then throws that after it has attempted to requeue all the messsagse from the unackedMap. merged from trunk r764111 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764130 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1806 : Ensure Flow to disk location is deleted when the queue is closedMartin Ritchie2009-04-112-2/+6
| | | | | | | | | Note: As our queues do not stop processing on the close() call it is possible that the backing store may not beable to be deleted. In this case all that will occur is that it will log the failure to disk so an operations team can manually clean it up. When we improve the Queueing model for AMQP 1-0 we can address this behaviour. merged fro trunk r764095 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764128 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1805 : Updated BackingStore to error if we cannot create the backing ↵Martin Ritchie2009-04-111-3/+31
| | | | | | | | | | store. Also updated so that we store the queues evenly over 256 bins, thus giving us the ability to have around 8.1 million actives queues. The Hash function was borrowed from Apache Harmony. Added manual testing to ensure we are not limited by Linux's max file/dir per Inode of 31998. Made the test manual as creating 32000 queues does take a little while. merged from trunk r764083 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764124 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1633 : Ensured that FlowToDisk configuration defaults to 100Meg and is ↵Martin Ritchie2009-04-112-3/+3
| | | | | | | | | picked up from the configuration files. merged from trunk r764082 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764123 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1791 : Replaced the get call before the dequeueAndDelete with a ↵Martin Ritchie2009-04-111-4/+1
| | | | | | | | | | | remove. So the remove call after the delete is now nolonger requried. Added manual test to assist identifing the problem merged from trunk r764079 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764119 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1794 : Moved processing of single message removals to just before the ↵Martin Ritchie2009-04-111-30/+29
| | | | | | | | | | | transaction commit rather than before the dequeue. As previously the list of dequeues was being traversed for every dequeue in that transaction batch with nothing to do. So removing this loop should increase performance in large batch cases. merged from trunk r764078 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@764118 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1790: add new attribute to logging management mbean to indicate ↵Robert Gemmell2009-04-092-2/+16
| | | | | | | | | available output levels. Update jmx management console to understand String[] attribute value and display contents properly merged from trunk, r762365 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@763595 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1794 : Removed unnecessary synchronisationMartin Ritchie2009-04-092-76/+70
| | | | | | | Merged from trunk r763363 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@763548 13f79535-47bb-0310-9956-ffa450edef68
* Wrapped log statement so it doesn't perform resolution when not logging.Martin Ritchie2009-04-091-1/+4
| | | | | | | Merged from trunk r763362 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@763547 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1794 : Clear the StoreContext after non-transactional processing. ↵Martin Ritchie2009-04-094-117/+148
| | | | | | Updated BaseTransactionLog to synchronize the on the enqueued messages from the _idToQueue Map as this will be being modified by many ack-ing threads and closing/requeue threads. Updated BaseTransactionLogTest so that it uses a single StoreContext per test rather than a fresh context for each operation. This was masking the problem. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@763546 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1793 : Increase logging on requeue to help diagnose what is being ↵Martin Ritchie2009-04-091-1/+9
| | | | | | requeued. Not on critical path so logging should not impact performance. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@763545 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1792: make JMXManagedObjectRegistry.close() method attempt to ↵Robert Gemmell2009-04-071-10/+15
| | | | | | | | | de-register only qpid related MBeans, preventing the RuntimeException that is a result of attempting to de-register the platform MBeanServerDelegate MBean, which is not allowed. Also remove unused imports. Merged from trunk, r762992 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@762999 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1764 : Resolved ConcurrentME. Perils of using the 'syntax sugar' for ↵Martin Ritchie2009-04-0317-263/+414
| | | | | | | | | | | | | loop hides the message iterator that you need to call .remove(). Calling remove on the underlying Map will cause the resulting CME. Merged from r761700 from trunk QPID-1764 : Updated all tests to use the TestTransactionLog interface and split testing code into subclasses. TestableTransactionLog will now correctly wrap a TransactionLog for testing. To enable testing of the BaseTransactionLog a TestableBaseTransactionLog was needed to only return values that are actually stored in the BaseTL the TestableTransactionLog actually stores single enqueues so that they can be queried by the test. Merged from r761741 from trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@761742 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1730: make it easy to configure queues, fix inheriting settings from ↵Aidan Skinner2009-04-037-21/+207
| | | | | | | | | | | | | the virtualhost. AMQQueue.configure: new method AMQQueueFactory: use AMQQueue.configure, don't set things directly SimpleAMQQueue.configure, MockAMQQueue.configure: implement new method from the interface QueueConfiguration: use VirtualHostConfiguration for default values if they're unset VirtualHostConfiguration: if a queue doesn't exist, give it a default configuration. Add methods to get default settings for configuration items QueueConfigurationTest: test case, checks that inheritance and defaults work along with explicitly set values. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@761733 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1784 Update to FlowableBaseQueueEntryList to ensure that the inhaler ↵Martin Ritchie2009-04-031-5/+18
| | | | | | | | | and purger threads will stop when the inMemory values are within the correct range. Merge of r761671 and r761674 from trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@761688 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1764 : Update to BaseTransactionLog to create a TestableTransactionLog, ↵Martin Ritchie2009-04-037-88/+261
| | | | | | | | | | | | which will replace TestableMessageStore. Update to BaseTransactionLog/Test to work correctly with transactions and to fully test that functionality. Updated StoreContext to know when it is in a transaction as relying on a payload being set is not sufficient as that is not set when running with the MessageMemoryStore and so transactional testing in the BTLT was not correct. Update to Virtualhost to correctly set the RoutingTable when the specified TransactionLog is wrapped in a BaseTransactionLog. Merged from r761670 on trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@761685 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1764 : Add a BaseTransactionLog that takes care of handling persistent ↵Martin Ritchie2009-04-0319-156/+1092
| | | | | | | | | | | | | | | | | | | | | | | | | | | message references so that the underlying TransactionLog need not worry about that. Updated MemoryMS to use this even to ensure that the code is exercised. To ensure that the new BaseTransactionLog was correctly used when used by a TransactionLog. The configure() method now returns an Object(TransactionLog) that is the newly configured TL. Existing tests and code where the original TL reference was used have been changed to use the output of the configure() call. NOTE: the return type should be changed to TransactionLog but until we have completely split the TransactionLog and RoutingTable implementations then this is not possible. The implementation also includes a number of items from the Flow To Disk review: - The old get* Methods have been removed from the TransactionLog interface. - Rollback should now rollback enqueues. (No test provided) - StoreContext now has enqueue/dequeue methods that track the messageId/Queue pairing - The linked list per message has been reduced to a link list per message that is enqueued on multiple queues. Messages that exist on only one queue have no additional overhead. - Optimisation also included to: Include message delete in 'dequeue transaction' where the message was only ever enqueued on a single queue. All other message deletes are peformed as part of an asynchrounous commit. The asynchrounous commit is setup via the StoreContext, which has had some work done to move it towards becomming a Qpid Transaction Object where all operations are performed against rather than going via the TransactionLog. Merged from r760951 on trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@761673 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1783 : Relax MessageFactory to allow out of order recoveryMartin Ritchie2009-04-022-18/+26
| | | | | | | | | | Relax MessageFactory to allow out of order. Updated test Merging trunk r760952 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@761251 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1768 : Added multithreaded test to ensure multiple concurrent adds are okMartin Ritchie2009-03-261-0/+123
| | | | | | | Merge of r758748 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@758763 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1768 : Removed all the special priority queue code. Added the ability ↵Martin Ritchie2009-03-266-335/+89
| | | | | | | | | for a FlowableBaseQueueEntryList to delegate its ac - New Messages on a flowed queue are pushed optimistically pushed to disk, this should potentially be removed and just rel - When space is available messages are loaded in queue order, so in this case Priority order. Merged revision r758742 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@758758 13f79535-47bb-0310-9956-ffa450edef68
* QPID-949 : renamed _disabled to _disableFlowtoDisk based on review feedbackMartin Ritchie2009-03-262-11/+11
| | | | | | | Merge of r758733 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@758754 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1776: fix interpolation of variables.Aidan Skinner2009-03-262-4/+28
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@758749 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1735 : Added Documentation to QueueBackingStore around thread safety of ↵Martin Ritchie2009-03-2512-122/+418
| | | | | | load/unload, Updated FQBS to adhere to the thread safety specified by the interface. QueueEntry was updated to return the AMQMessage from the load() to complete the getMessage() interface. As in a flowed state the message may be purged before a reference can be taken. Added new Test QueueEntryImplThreadingTest that should later be run for longer but aims to show that load always returns the message even when unloads are occuring asynchronously. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@758388 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1735 : Removed duplicated methods with differing functionality that was ↵Martin Ritchie2009-03-254-17/+8
| | | | | | causing FtD to fail. Annoyingly the tests work as they used the method with the extra functionality. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@758372 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1511: add scripts to generate example ssl stores, and add refrence in ↵Robert Gemmell2009-03-223-1/+77
| | | | | | the relevant exception message git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@757268 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1767: add units to message age attribute descriptionRobert Gemmell2009-03-221-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@757257 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1763 : Fixed slow down due to fs lookup for unloaded message introduced ↵Martin Ritchie2009-03-201-5/+11
| | | | | | in r748516 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@756506 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1743: change maxMessageSize description to indicate it is in Bytes not ↵Robert Gemmell2009-03-171-7/+6
| | | | | | KBytes, make size descriptions in other methods consistent git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@755256 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1626: handle legacy config file a bit more gracefully.Aidan Skinner2009-03-162-0/+73
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@754958 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1736: Timeout DNS lookups if they take more than 30 seconds.Aidan Skinner2009-03-161-3/+60
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@754934 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1730 : Logging update highlighted that we were printing the queue ↵Martin Ritchie2009-03-132-2/+2
| | | | | | before we had fully initialised it. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@753253 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1730 : Improve the logging so we can see what is going one during ↵Martin Ritchie2009-03-134-5/+20
| | | | | | persistent recovery as we do not have a working persistent module. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@753220 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1730 : Update the order in which we initialise. We now load the config ↵Martin Ritchie2009-03-131-41/+162
| | | | | | file from disk then recover from the persistent strore. This approach applies the vhost configuration and then applies the persistent state from the store to those objects rather than recreating them. The new inner classes on VirtualHost are to be removed once we have fully extracted the RoutingTable from the legacy MessageStores as this is the root of the problem. The Store needs to be open to create new durable objects but the current stores must recover their state before new entries are added. So now the persistent state is being loaded on to a broker in a consistent state after it has configured a) its default exchanges and b) loaded the queue config from the config file. Eventually we will only have one location for queue config and all will be right in the world. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@753219 13f79535-47bb-0310-9956-ffa450edef68
* QPID-949 : Removed the deleteOnExit calls on all flowed entries, as this ↵Martin Ritchie2009-03-095-14/+24
| | | | | | will increase our memory usage. Instead add a close method on the BackingStore that is called when the queue closes and clean up the backing then. Also moved the QueueHousekeeping thread stop to before we do any queue closing in the VHost. This will ensure that we are not causing any operations that might inadvertadly load a message, and so prevent the backing file from being deleted. This should of course now not occur as all getMessage() calls have been removed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@751722 13f79535-47bb-0310-9956-ffa450edef68
* QPID-949 : Removed all getMessage() calls as this will cause a flowed ↵Martin Ritchie2009-03-0915-64/+77
| | | | | | message to be read in to memory from disk. In all instances the reason was to perform methods that exist on the the QueueEntry. Added accessor to MessageID on QueueEntry. Outstanding getMessage() calls have been left in to perform NO_LOCAL work. Moving Publisher and PublisherClient identifer to the QEI would remove this need. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@751718 13f79535-47bb-0310-9956-ffa450edef68
* Added test to ensure ThreadPool is references are correctly removed for ↵Martin Ritchie2009-03-092-10/+45
| | | | | | Priority queues. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@751714 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1634 : FileQueueBackingStore had two issues. Delete wasn't using the ↵Martin Ritchie2009-03-061-7/+9
| | | | | | getFileHandle() method so it was attempting to delete a bin rather than the message data. Our Broker Unit tests don't create the right type of ByteBuffer so whilst they passed the buffer.getData().array() failed as array() is not supported in the ByteBuffer types we actually use at runtime. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750876 13f79535-47bb-0310-9956-ffa450edef68
* QPID-949, QPID-1633 : Set default Maximum Memory Usage for a queue to ↵Martin Ritchie2009-03-064-14/+100
| | | | | | | | 100Meg. Future work would be to have the broker split Xmx between VirtualHost and for the Vhost then to use its housekeeping thread to spread the memory between the current queues. It could of course be clever and give more memory to queues in high use. Mistype in AMQQueueFactory resulted in it setting the Max Queue Size alert rather than the Max Memory value git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750875 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status