Author: dejanb
Date: Wed Sep 9 11:09:03 2009
New Revision: 812885
URL: http://svn.apache.org/viewvc?rev=812885&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-1894 - throughput configuration
and changed default kahadb properties
Added:
activemq/trunk/assembly/src/sample-conf/activemq-throughput.xml
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
activemq/trunk/assembly/src/sample-conf/activemq-scalability.xml
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=812885&r1=812884&r2=812885&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Wed Sep 9 11:09:03 2009
@@ -138,7 +138,7 @@
protected boolean deleteAllMessages;
protected File directory;
protected Thread checkpointThread;
- protected boolean enableJournalDiskSyncs=true;
+ protected boolean enableJournalDiskSyncs=false;
long checkpointInterval = 5*1000;
long cleanupInterval = 30*1000;
int journalMaxFileLength = Journal.DEFAULT_MAX_FILE_LENGTH;
Modified: activemq/trunk/assembly/src/sample-conf/activemq-scalability.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/sample-conf/activemq-scalability.xml?rev=812885&r1=812884&r2=812885&view=diff
==============================================================================
--- activemq/trunk/assembly/src/sample-conf/activemq-scalability.xml (original)
+++ activemq/trunk/assembly/src/sample-conf/activemq-scalability.xml Wed Sep 9
11:09:03 2009
@@ -60,7 +60,7 @@
http://activemq.apache.org/kahadb.html
-->
<persistenceAdapter>
- <kahaDB directory="${activemq.base}/data/kahadb"
indexWriteBatchSize="1000" enableIndexWriteAsync="true"
enableJournalDiskSyncs="false" />
+ <kahaDB directory="${activemq.base}/data/kahadb"
enableIndexWriteAsync="true"/>
</persistenceAdapter>
<!--
Added: activemq/trunk/assembly/src/sample-conf/activemq-throughput.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/assembly/src/sample-conf/activemq-throughput.xml?rev=812885&view=auto
==============================================================================
--- activemq/trunk/assembly/src/sample-conf/activemq-throughput.xml (added)
+++ activemq/trunk/assembly/src/sample-conf/activemq-throughput.xml Wed Sep 9
11:09:03 2009
@@ -0,0 +1,74 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ Tune ActiveMQ broker for high throughput of messages
+ Be sure to make necessary changes in your producer and consumer, since
there you can make the most notable difference
+
+ For more information, see:
+ http://activemq.apache.org/performance-tuning.html
+ -->
+<beans
+ xmlns="http://www.springframework.org/schema/beans";
+ xmlns:amq="http://activemq.apache.org/schema/core";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd";>
+
+ <!-- Allows us to use system properties as variables in this configuration
file -->
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker xmlns="http://activemq.apache.org/schema/core";
brokerName="localhost" dataDirectory="${activemq.base}/data" useJmx="false"
advisorySupport="false">
+
+ <!--
+ Use VM cursor
+ For more information, see:
+ http://activemq.apache.org/message-cursors.html
+ -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry queue=">">
+ <pendingQueuePolicy>
+ <vmQueueCursor />
+ </pendingQueuePolicy>
+ </policyEntry>
+ </policyEntries>
+ </policyMap>
+ </destinationPolicy>
+
+ <!--
+ Use KahaDB for persistence
+ Tune it a bit so we minimize IO operations
+ For more information, see:
+ http://activemq.apache.org/kahadb.html
+ -->
+ <persistenceAdapter>
+ <kahaDB directory="${activemq.base}/data/kahadb"
indexWriteBatchSize="10000" />
+ </persistenceAdapter>
+
+ <!--
+ Use TCP transport
+ For more information, see:
+ http://activemq.apache.org/configuring-transports.html
+ -->
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://0.0.0.0:61616"/>
+ </transportConnectors>
+
+ </broker>
+
+</beans>
