summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
* QPID-1813/QPID-1817 : Removed the new properties from the test-provider as ↵Martin Ritchie2009-04-161-2/+2
| | | | | | this will affect all tests. The NoLocalAfterRecoveryTest now updates a ConnectionURL based on the JNDI data and uses that to start a connection. NLART also provides a default location for the derbyDB store as the DMS class does not correctly attempt to put the store in QPID_WORK. This will be re-addressed when ServerConfiguration is again available from a VHC object. ConnectionTest was updated to remove the literal values for the BrokerDetail options. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765608 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1813 : Provide test that uses the DerbyMessageStore to check NoLocal ↵Martin Ritchie2009-04-161-1/+2
| | | | | | functionality after a broker restart. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765604 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1813 : Check the value of _sessionIdentifier and return null if it is ↵Martin Ritchie2009-04-162-7/+25
| | | | | | null rather than an NPE. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765600 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1815 : Ensure Derby store looks up existing queues/exchanges in the ↵Martin Ritchie2009-04-161-5/+17
| | | | | | virtualhost on recovery git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765597 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1814 : Don't always attempt to create the default exchanges in the ↵Martin Ritchie2009-04-161-0/+9
| | | | | | persistent store as they are always created first. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765596 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1814 : Relax Derby so that it does not error if you create an existing ↵Martin Ritchie2009-04-161-27/+50
| | | | | | Exchange or Queue git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765593 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1812: Fix firewall rule parsing, add test for this.Aidan Skinner2009-04-152-4/+64
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765250 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1807 : Add 0.5-fix broker and update SlowMessageStore to use ↵Martin Ritchie2009-04-14339-0/+58226
| | | | | | MessageStores rather than TransactionLogs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764850 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1807 : Remove old broker and FlowToDisk related testsMartin Ritchie2009-04-14360-62214/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764838 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1800: only create the new empty arraylist after checking for a previous ↵Robert Gemmell2009-04-101-2/+5
| | | | | | enqueue list, as it often wont be required git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764113 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1793 : Update AMQChannel to remember any AMQException that occurs ↵Martin Ritchie2009-04-101-9/+28
| | | | | | during requeue and then throws that after it has attempted to requeue all the messsagse from the unackedMap. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764111 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1800: remove unecessary addAll() command, as the list is about to be ↵Robert Gemmell2009-04-101-1/+1
| | | | | | cloned we can simply use the original list git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764105 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1806 : Ensure Flow to disk location is deleted when the queue is closedMartin Ritchie2009-04-102-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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764095 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1805 : Updated BackingStore to error if we cannot create the backing ↵Martin Ritchie2009-04-101-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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764083 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1633 : Ensured that FlowToDisk configuration defaults to 100Meg and is ↵Martin Ritchie2009-04-102-3/+3
| | | | | | picked up from the configuration files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764082 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1791 : Replaced the get call before the dequeueAndDelete with a remove. ↵Martin Ritchie2009-04-101-4/+1
| | | | | | | | So the remove call after the delete is now nolonger requried. Added manual test to assist identifing the problem git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764079 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1794 : Moved processing of single message removals to just before the ↵Martin Ritchie2009-04-101-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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764078 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1800: modify SAMQQ to record transactionlog etry even when queue isnt ↵Robert Gemmell2009-04-102-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 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764075 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1798: Update AMQQueueMBean to use new constant value of DeliveryMode, ↵Robert Gemmell2009-04-104-6/+8
| | | | | | replacing previously incorrect literal value used in conditional statement and thus preventing the reversal of delivery mode status. Also update other broker classes making similar comparisons using a literal value to use a constant git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764026 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1801 Added method to show failure to PrincipalPermissionsTest.java and ↵Marnie McCormack2009-04-102-2/+11
| | | | | | then adjusted the ternary operator in PrincipalPermissions.java to ensure we don't pass a null into the map (see JIRA descriptions). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@763959 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1794 : Removed unnecessary synchronisationMartin Ritchie2009-04-082-76/+70
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@763363 13f79535-47bb-0310-9956-ffa450edef68
* Wrapped log statement so it doesn't perform resolution when not logging.Martin Ritchie2009-04-081-1/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@763362 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1794 : Clear the StoreContext after non-transactional processing. ↵Martin Ritchie2009-04-084-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/trunk@763361 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1793 : Increase logging on requeue to help diagnose what is being ↵Martin Ritchie2009-04-081-1/+9
| | | | | | requeued. Not on critical path so logging should not impact performance. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@763360 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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@762992 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1790: add new attribute to logging management mbean to indicate ↵Robert Gemmell2009-04-062-2/+16
| | | | | | available output levels. Update jmx management console to understand String[] attribute value and display contents properly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@762365 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1764 : Updated all tests to use the TestTransactionLog interface and ↵Martin Ritchie2009-04-0316-261/+397
| | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@761741 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/trunk@761721 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1764 : Resolved ConcurrentME. Perils of using the 'syntax sugar' for ↵Martin Ritchie2009-04-031-2/+17
| | | | | | loop hides the message iterator that you need to call .remove(). Calling remove on the underlying Map will cause the resulting CME. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@761700 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1784 : Fixed compile errorMartin Ritchie2009-04-031-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@761674 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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@761671 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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@761670 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1783 : Relax MessageFactory to allow out of order recoveryMartin Ritchie2009-04-012-18/+26
| | | | | | Relax MessageFactory to allow out of order. Updated test git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@760952 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1764 : Add a BaseTransactionLog that takes care of handling persistent ↵Martin Ritchie2009-04-0119-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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@760951 13f79535-47bb-0310-9956-ffa450edef68
* Reduce logging to ease CC buildsMartin Ritchie2009-03-271-3/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@759297 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1768 : Added multithreaded test to ensure multiple concurrent adds are ok.Martin Ritchie2009-03-261-0/+123
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@758748 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 accounting to a parent QueueEntryList. This results in the PriorityQueueEntryList using the same FtD algorithm as SimpleQELs. - New Messages on a flowed queue are pushed optimistically pushed to disk, this should potentially be removed and just rely on the purger to flush the correct message which in the Priority case may not be the last message in. - When space is available messages are loaded in queue order, so in this case Priority order. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@758742 13f79535-47bb-0310-9956-ffa450edef68
* QPID-949 : renamed _disabled to _disableFlowtoDisk based on review feedbackMartin Ritchie2009-03-262-11/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@758733 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/trunk@758730 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1735 : Added Documentation to QueueBackingStore around thread safety of ↵Martin Ritchie2009-03-2511-122/+258
| | | | | | | | | | 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. Commit from 0.5-release : r758388 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@758397 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1735 : Removed duplicated methods with differing functionality that was ↵Martin Ritchie2009-03-254-22/+8
| | | | | | | | | | causing FtD to fail. Annoyingly the tests work as they used the method with the extra functionality. Commit from 0.5-release : r758382 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@758395 13f79535-47bb-0310-9956-ffa450edef68
* QEIT.testExpiry() only allows 10ms for creating the QueueEntry. Depending on ↵Martin Ritchie2009-03-251-7/+8
| | | | | | the running platform and the result of currentTimeMillis() it can be a close to allowing expiry git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@758377 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1511: add scripts to generate example ssl stores, and add refrence in ↵Robert Gemmell2009-03-221-1/+3
| | | | | | | | | the relevant exception message Merged from branches/0.5-release : r757268 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@757270 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1767: add units to message age attribute descriptionRobert Gemmell2009-03-221-3/+3
| | | | | | | Merged from branches/0.5-release : r757257 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@757258 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 Merged from branches/0.5-release : r756506 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@756518 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