summaryrefslogtreecommitdiff
path: root/qpid/java/broker
Commit message (Collapse)AuthorAgeFilesLines
* 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
* QPID-1635 : Feed back from review, ensure that getMessage() never returns ↵Martin Ritchie2009-03-062-15/+10
| | | | | | null. Used setDeliveredToConsumers() on QEI to know when it is safe to unload message so SAMQQueue does not need to have anything to do with message un/loading. So the FtD work is fully encapuslated by the QEI which delegates memory accounting to its list. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750874 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1628 : Ensured all getSize() calls are done on the QueueEntry to ↵Martin Ritchie2009-03-069-25/+26
| | | | | | prevent the inadvertent loading of a flowed message with a call to getMessage() git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750873 13f79535-47bb-0310-9956-ffa450edef68
* Style ChangesMartin Ritchie2009-03-062-69/+61
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750871 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1639 : Added test to ensure that properties passed on QueueDeclare are ↵Martin Ritchie2009-03-061-5/+59
| | | | | | applied to queue. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@750867 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1637 : Update to test to correctly use priority queues in test. Fixed ↵Martin Ritchie2009-03-037-67/+183
| | | | | | big in inhaler/purger to ensure priority data is correctly reloaded. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749699 13f79535-47bb-0310-9956-ffa450edef68
* Prevent NullPointerException when backing store file is deleted externallyMartin Ritchie2009-03-031-7/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749697 13f79535-47bb-0310-9956-ffa450edef68
* QPID-430: Change configuration variable name in line with review remarks.Aidan Skinner2009-03-033-6/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749572 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1583: close all app registries after use.Aidan Skinner2009-03-021-2/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749340 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1637 : Added Purger thread for Priority Queues and when threasholds are ↵Martin Ritchie2009-03-0214-211/+673
| | | | | | | | | | | | adjusted. QueueEntries are now the point of entry to load/unload rather than the List. This is because it is only the QueueEntryList that the QueueEntry that is attached to that can correctly account for the inMemory usage. In the Priority Queue case the priority queue does not know which sub list the QueueEntry is on. As the QEI knows it makes sence to request load/unload through the entry. Set the default Maximum InMemory to -1, disabled. Removed the FlowableQueueEntryList interface, merged with QueueEntryList git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749331 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1583: Add test for reloading external firewall rules, fix buglets this ↵Aidan Skinner2009-03-0210-80/+299
| | | | | | test exposed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749315 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1704: updated server configuration testRobert Gemmell2009-03-021-12/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749285 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1704: remove JMXMP ConnectorServer usage from the brokers JMX ↵Robert Gemmell2009-03-025-165/+123
| | | | | | management capabilities git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749282 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1492: make the broker return the current queue depth and maximum queue ↵Robert Gemmell2009-03-024-14/+13
| | | | | | depth in bytes rather than kilbytes, matching their respective setter methods. Augment the management console's navigation queue selection list to show the appropriate numbers git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749149 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1655: use a File object to hold reference to access file instead of a ↵Robert Gemmell2009-02-272-117/+280
| | | | | | String to fix issue with createTempFile and absolute paths. Stop catching IOExceptions in saveAccessFile() and make calling methods catch them to check for and report failure and act accordingly to reverse actions in memory. Add additional unit tests to cover access rights file manipulation. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748686 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1536: modify the B64MD5 PD to take plain text input and perform the ↵Robert Gemmell2009-02-275-106/+229
| | | | | | required hashing itself in order to present a consistent interface for user management. Alter management console to use mbean versioning to detect this and send plaintext to v2+ user management mbeans. Update RMIPasswordAuthenticator to make use of the new PD input consistency git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748680 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1502: Update the PlainPasswordFilePrincipalDatabase to be manipulatable ↵Robert Gemmell2009-02-274-44/+870
| | | | | | by the management console and cached in memory like the B64MD5 PD. Add unit tests for the PlainPD git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748641 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1699: fix mbean annotation, log failure to reload file. Address review ↵Aidan Skinner2009-02-272-6/+13
| | | | | | comments from robbie. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748591 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1699: reload the config file sections that we can when we receive ↵Aidan Skinner2009-02-275-8/+155
| | | | | | SIGHUP. Add jmx method to do so. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748561 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1635,QPID-1636,QPID-1638 : Updated QueueEntries to contain additional ↵Martin Ritchie2009-02-2720-292/+643
| | | | | | | | | | | | | | | | | | | values from AMQMessage, _flags and expiry this allows the checking of immediate delivery and expiry on unloaded messages. Updated nomenclature to use load/unload rather than the overloaded flow/recover. Created new FileQueueBackingStoreFactory to ensure that validates and creates initial flowToDiskLocation and creates a new BackingStore. Responsibility for FlowToDisk has been added to the QueueEntryLists. This will allow the easy unloading of the structure in the future. Inorder to do this the size,count and memory count properties had to be moved from the SimpleAMQQueue to the QueueEntryList. An Inhaler thread was created in addition to the synchronous loading of messages. This is initiated as a result of a flowed QEL dropping below the minimumMemory value. A test to ensure that the queue never exceeds its set memory usage and that the count does not go negative has been added to SimpleAMQQueueTest. The SimpleAMQQueue is responsible for deciding when a message can be unloaded after delivery takes place. The QEL cannot decide this as there is no state for a message being marked as sent to a consumer. Only Aquired and Dequeued. The unloaded message is only deleted after the QueueEntry is deleted from the QEL. This negates the need to recreated the data on disk if the message needs to be unloaded again. All files/directories relating to FtD are created as deleteOnExit files so that under clean shutdown the VM will ensure that the files are deleted. On startup the flowToDiskLocation is also purged to ensure a clean starting point. SAMQQueueThreadPoolTest was augmented to take in to account the new inhaler executor reference. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748519 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1635,QPID-1636 : Moved additional properties from AMQMessage up to ↵Martin Ritchie2009-02-2719-416/+775
| | | | | | QueueEntry to allow processing whilst messasge has been flowed. Moved : _flags (for Immediate and delivered status), expiry, messageID. Created base class to maintain counts of data and objects in queue. Removed this responsibility from the AMQQueues and on to the QueueEntryLists. This will more easily allow the QEL structure to be flowed to disk at a later stage. Updated tests as a result of moves. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748516 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1632 : Tidied up old referenceCount variable that was still in use in ↵Martin Ritchie2009-02-271-4/+2
| | | | | | logging. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748514 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1629 : Forgot to delete AMQMessageHandle.javaMartin Ritchie2009-02-271-75/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@748513 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1648: Remove doubling of new classes. Stoopid patch(1). PEBKAC.Aidan Skinner2009-02-253-1209/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747875 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1648: Add LoggingManagement and associated MBean to enable dynamic ↵Aidan Skinner2009-02-257-42/+2485
| | | | | | | | reloading of log4j file. Update sample log4js so that they aren't arbitrarily rewritten. Patch from Robbie Gemmell <gemmellr@dcs.gla.ac.uk> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747870 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1568: make isInstanceOf and isRegistered read only methods. Fix code ↵Aidan Skinner2009-02-251-11/+18
| | | | | | | | style issue with field name. Patch from Robbie Gemmell <gemmellr@dcs.gla.ac.uk> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747869 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1537: Version MBeans.Aidan Skinner2009-02-2514-17/+27
| | | | | | Patch from Robbie Gemmell <gemmellr@dcs.gla.ac.uk> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747868 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1668: check initial count, don't assume it's 0. It should be, but there ↵Aidan Skinner2009-02-251-4/+4
| | | | | | are bugs in ApplicationRegistry.close that prevent this from working. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747783 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1686 - Had to had another AR.getInstance() call as alternative is to ↵Martin Ritchie2009-02-251-2/+12
| | | | | | complete this JIRA. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747755 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1634 : Created QueueBackingStore interface and implementation ↵Martin Ritchie2009-02-2510-18/+775
| | | | | | FileQueueBackingStore. Tested by FileQueueBackingStoreTest. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747754 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1633 : Added new properties to SimpleAMQQueue with appropriate ↵Martin Ritchie2009-02-2510-8/+292
| | | | | | getters/setters from the ServerConfiguration and Management Console. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747753 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1632 : Removed commented codeMartin Ritchie2009-02-251-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747751 13f79535-47bb-0310-9956-ffa450edef68
* Fix build deps fileAidan Skinner2009-02-241-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747376 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: Allow split configuration files. Add tests for old-style and ↵Aidan Skinner2009-02-241-0/+4
| | | | | | | | new-style file parsing. This depends on an upgraded commons-configuration, which needs commons-digester and commons-beanutils. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747370 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: add environment variables for some things, sanitise the ↵Aidan Skinner2009-02-241-10/+0
| | | | | | housekeeping timer. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747369 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: add test class for ServerConfigurationAidan Skinner2009-02-241-0/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747367 13f79535-47bb-0310-9956-ffa450edef68
* Merge branch 'QPID-1612'Aidan Skinner2009-02-242-15/+741
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747363 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1621,QPID-1632 : Added a setManagementEnabled option to allow the MC to ↵Martin Ritchie2009-02-207-29/+24
| | | | | | be disabled. Updates as a result of merging configuration changes. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@746265 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1632 - Removal of reference counting and update to tests, TxAckTest was ↵Martin Ritchie2009-02-2030-464/+430
| | | | | | | | reduced in size as reference counting is now not modified until the transaction completes. Replaced MessageReferenceCoutingTest with PersistentMessageTest and further tests wil be created when DerbyDBMessageStore is also updated. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@746260 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1632 - Initial testing of reference counting and implemntation of ↵Martin Ritchie2009-02-2020-267/+168
| | | | | | TransactionLog based reference counting git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@746259 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status