4:12 a.m.
Author: timfox
Date: 2009-12-02 05:12:45 -0500 (Wed, 02 Dec 2009)
New Revision: 8495
Modified:
trunk/docs/user-manual/en/configuration-index.xml
trunk/docs/user-manual/en/persistence.xml
trunk/src/config/common/schema/hornetq-configuration.xsd
trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java
trunk/tests/config/ConfigurationTest-full-config.xml
Log:
changed journal-max-aio to journal-max-io
Modified: trunk/docs/user-manual/en/configuration-index.xml
===================================================================
--- trunk/docs/user-manual/en/configuration-index.xml 2009-12-02 10:07:13 UTC (rev 8494)
+++ trunk/docs/user-manual/en/configuration-index.xml 2009-12-02 10:12:45 UTC (rev 8495)
@@ -172,8 +172,8 @@
<entry>128 * 1024</entry>
</row>
<row>
- <entry><link
linkend="configuring.message.journal.journal-max-aio"
- >journal-max-aio</link></entry>
+ <entry><link
linkend="configuring.message.journal.journal-max-io"
+ >journal-max-io</link></entry>
<entry>Integer</entry>
<entry>the maximum number of write requests that can be
in the AIO queue
at any one time</entry>
Modified: trunk/docs/user-manual/en/persistence.xml
===================================================================
--- trunk/docs/user-manual/en/persistence.xml 2009-12-02 10:07:13 UTC (rev 8494)
+++ trunk/docs/user-manual/en/persistence.xml 2009-12-02 10:12:45 UTC (rev 8495)
@@ -183,8 +183,8 @@
<para>Depending on how much data you expect your queues to contain
at steady state
you should tune this number of files to match that total amount of
data.</para>
</listitem>
- <listitem id="configuring.message.journal.journal-max-aio">
- <para><literal>journal-max-aio</literal></para>
+ <listitem id="configuring.message.journal.journal-max-io">
+ <para><literal>journal-max-io</literal></para>
<para>When using an AIO journal, write requests are queued up
before being submitted
to AIO for execution. Then when AIO has completed them it calls
HornetQ back.
This parameter controls the maximum number of write requests that can
be in the
Modified: trunk/src/config/common/schema/hornetq-configuration.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-configuration.xsd 2009-12-02 10:07:13 UTC (rev
8494)
+++ trunk/src/config/common/schema/hornetq-configuration.xsd 2009-12-02 10:12:45 UTC (rev
8495)
@@ -166,7 +166,7 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="journal-compact-min-files" type="xsd:int">
</xsd:element>
- <xsd:element maxOccurs="1" minOccurs="0"
name="journal-max-aio" type="xsd:int">
+ <xsd:element maxOccurs="1" minOccurs="0"
name="journal-max-io" type="xsd:int">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0"
name="perf-blast-pages" type="xsd:int">
</xsd:element>
Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-12-02 10:07:13
UTC (rev 8494)
+++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-12-02 10:12:45
UTC (rev 8495)
@@ -348,7 +348,7 @@
GT_ZERO);
int journalMaxIO = getInteger(e,
- "journal-max-aio",
+ "journal-max-io",
journalType == JournalType.ASYNCIO ?
DEFAULT_JOURNAL_MAX_IO_AIO
:
DEFAULT_JOURNAL_MAX_IO_NIO,
GT_ZERO);
Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml 2009-12-02 10:07:13 UTC (rev
8494)
+++ trunk/tests/config/ConfigurationTest-full-config.xml 2009-12-02 10:12:45 UTC (rev
8495)
@@ -45,7 +45,7 @@
<journal-sync-non-transactional>true</journal-sync-non-transactional>
<journal-file-size>12345678</journal-file-size>
<journal-min-files>100</journal-min-files>
- <journal-max-aio>56546</journal-max-aio>
+ <journal-max-io>56546</journal-max-io>
<large-messages-directory>largemessagesdir</large-messages-directory>
<memory-warning-threshold>95</memory-warning-threshold>
<memory-measure-interval>54321</memory-measure-interval>