Author: clebert.suconic(a)jboss.com Date: 2009-11-12 16:08:49 -0500 (Thu, 12 Nov 2009) New Revision: 8277 Modified: trunk/docs/user-manual/en/configuration-index.xml trunk/docs/user-manual/en/perf-tuning.xml trunk/docs/user-manual/en/persistence.xml trunk/examples/core/perf/server0/hornetq-configuration.xml trunk/src/config/common/schema/hornetq-configuration.xsd trunk/src/main/org/hornetq/core/config/Configuration.java trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java trunk/src/main/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFileFactory.java trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/tests/config/ConfigurationTest-full-config.xml trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-214 - Documentation and configuration changes Modified: trunk/docs/user-manual/en/configuration-index.xml =================================================================== --- trunk/docs/user-manual/en/configuration-index.xml 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/docs/user-manual/en/configuration-index.xml 2009-11-12 21:08:49 UTC (rev 8277) @@ -115,25 +115,25 @@ </row> <row> <entry><link - linkend="configuring.message.journal.journal-aio-buffer-size" - >journal-aio-buffer-size</link></entry> + linkend="configuring.message.journal.journal-buffer-size" + >journal-buffer-size</link></entry> <entry>Long</entry> - <entry>The size of the internal buffer on AIO.</entry> + <entry>The size of the internal buffer on the journal.</entry> <entry>128 KiB</entry> </row> <row> <entry><link - linkend="configuring.message.journal.journal-aio-buffer-timeout" - >journal-aio-buffer-timeout</link></entry> + linkend="configuring.message.journal.journal-buffer-timeout" + >journal-buffer-timeout</link></entry> <entry>Long</entry> <entry>The timeout (in nanoseconds) used to flush internal - buffers.</entry> + buffers on the journal.</entry> <entry>20000</entry> </row> <row> <entry><link - linkend="configuring.message.journal.journal-aio-flush-on-sync" - >journal-aio-flush-on-sync</link></entry> + linkend="configuring.message.journal.journal-flush-on-sync" + >journal-flush-on-sync</link></entry> <entry>Boolean</entry> <entry>If true, transactions will ignore timeouts and be persisted immediately</entry> Modified: trunk/docs/user-manual/en/perf-tuning.xml =================================================================== --- trunk/docs/user-manual/en/perf-tuning.xml 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/docs/user-manual/en/perf-tuning.xml 2009-11-12 21:08:49 UTC (rev 8277) @@ -49,13 +49,13 @@ will scale better than Java NIO.</para> </listitem> <listitem> - <para><literal>journal-aio-flush-on-sync</literal>. If you don't have many producers - in your system you may consider setting journal-aio-flush-on-sync to true. + <para><literal>journal-flush-on-sync</literal>. If you don't have many producers + in your system you may consider setting journal-flush-on-sync to true. HornetQ by default is optimized by the case where you have many producers. We try to combine multiple writes in a single OS operation. However if that's not your case setting this option to true will give you a performance boost.</para> <para>On the other hand when you have multiple producers, keeping <literal - >journal-aio-flush-on-sync</literal> set to false. This will make your + >journal-flush-on-sync</literal> set to false. This will make your system flush multiple syncs in a single OS call making your system scale much better.</para> </listitem> Modified: trunk/docs/user-manual/en/persistence.xml =================================================================== --- trunk/docs/user-manual/en/persistence.xml 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/docs/user-manual/en/persistence.xml 2009-11-12 21:08:49 UTC (rev 8277) @@ -195,8 +195,8 @@ at the OS level (/proc/sys/fs/aio-max-nr) usually at 65536.</para> <para>The default value for this is <literal>500</literal>. </para> </listitem> - <listitem id="configuring.message.journal.journal-aio-buffer-timeout"> - <para><literal>journal-aio-buffer-timeout</literal></para> + <listitem id="configuring.message.journal.journal-buffer-timeout"> + <para><literal>journal-buffer-timeout</literal></para> <para>Flush period on the internal AIO timed buffer, configured in nano seconds. For performance reasons we buffer data before submitting it to the kernel in a single batch. This parameter determines the maximum amount of time to wait @@ -205,8 +205,8 @@ <para>The default value for this paramater is <literal>20000</literal> nano seconds (i.e. 20 microseconds). </para> </listitem> - <listitem id="configuring.message.journal.journal-aio-flush-on-sync"> - <para><literal>journal-aio-flush-on-sync</literal></para> + <listitem id="configuring.message.journal.journal-flush-on-sync"> + <para><literal>journal-flush-on-sync</literal></para> <para>If this is set to true, the internal buffers are flushed right away when a sync request is performed. Sync requests are performed on transactions if <literal>journal-sync-transactional</literal> is true, or on sending regular @@ -220,8 +220,8 @@ flush-on-sync.</para> <para>The default value for this parameter is <literal>false</literal>. </para> </listitem> - <listitem id="configuring.message.journal.journal-aio-buffer-size"> - <para><literal>journal-aio-buffer-size</literal></para> + <listitem id="configuring.message.journal.journal-buffer-size"> + <para><literal>journal-buffer-size</literal></para> <para>The size of the timed buffer on AIO. The default value is <literal </listitem> Modified: trunk/examples/core/perf/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/core/perf/server0/hornetq-configuration.xml 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/examples/core/perf/server0/hornetq-configuration.xml 2009-11-12 21:08:49 UTC (rev 8277) @@ -21,7 +21,7 @@ <journal-sync-transactional>false</journal-sync-transactional> <journal-type>ASYNCIO</journal-type> <journal-min-files>20</journal-min-files> - <journal-aio-buffer-timeout>20000</journal-aio-buffer-timeout> + <journal-buffer-timeout>20000</journal-buffer-timeout> <log-journal-write-rate>false</log-journal-write-rate> <run-sync-speed-test>false</run-sync-speed-test> Modified: trunk/src/config/common/schema/hornetq-configuration.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-configuration.xsd 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/src/config/common/schema/hornetq-configuration.xsd 2009-11-12 21:08:49 UTC (rev 8277) @@ -148,11 +148,11 @@ </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="journal-type" type="journalType"> </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-aio-buffer-timeout" type="xsd:long"> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-buffer-timeout" type="xsd:long"> </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-aio-buffer-size" type="xsd:long"> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-buffer-size" type="xsd:long"> </xsd:element> - <xsd:element maxOccurs="1" minOccurs="0" name="journal-aio-flush-on-sync" type="xsd:boolean"> + <xsd:element maxOccurs="1" minOccurs="0" name="journal-flush-on-sync" type="xsd:boolean"> </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="journal-sync-transactional" type="xsd:boolean"> </xsd:element> Modified: trunk/src/main/org/hornetq/core/config/Configuration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/Configuration.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/src/main/org/hornetq/core/config/Configuration.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -228,17 +228,17 @@ void setJournalMaxAIO(int maxAIO); - void setAIOBufferSize(int size); + void setJournalBufferSize(int size); - int getAIOBufferSize(); + int getJournalBufferSize(); - void setAIOBufferTimeout(int timeout); + void setJournalBufferTimeout(int timeout); - int getAIOBufferTimeout(); + int getJournalBufferTimeout(); - void setAIOFlushOnSync(boolean flush); + void setJournalFlushOnSync(boolean flush); - boolean isAIOFlushOnSync(); + boolean isJournalFlushOnSync(); boolean isCreateBindingsDir(); Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -102,11 +102,11 @@ public static final int DEFAULT_JOURNAL_MAX_AIO = 500; - public static final boolean DEFAULT_JOURNAL_AIO_FLUSH_SYNC = false; + public static final boolean DEFAULT_JOURNAL_FLUSH_SYNC = false; - public static final int DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT = 20000; + public static final int DEFAULT_JOURNAL_BUFFER_TIMEOUT = 20000; - public static final int DEFAULT_JOURNAL_AIO_BUFFER_SIZE = 128 * 1024; + public static final int DEFAULT_JOURNAL_BUFFER_SIZE = 128 * 1024; public static final boolean DEFAULT_JOURNAL_LOG_WRITE_RATE = false; @@ -268,11 +268,11 @@ protected int journalMaxAIO = DEFAULT_JOURNAL_MAX_AIO; - protected boolean journalAIOFlushSync = DEFAULT_JOURNAL_AIO_FLUSH_SYNC; + protected boolean journalFlushSync = DEFAULT_JOURNAL_FLUSH_SYNC; - protected int journalAIOBufferTimeout = DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT; + protected int journalBufferTimeout = DEFAULT_JOURNAL_BUFFER_TIMEOUT; - protected int journalAIOBufferSize = DEFAULT_JOURNAL_AIO_BUFFER_SIZE; + protected int journalBufferSize = DEFAULT_JOURNAL_BUFFER_SIZE; protected boolean logJournalWriteRate = DEFAULT_JOURNAL_LOG_WRITE_RATE; @@ -815,34 +815,34 @@ jmxDomain = domain; } - public void setAIOBufferTimeout(int timeout) + public void setJournalBufferTimeout(int timeout) { - this.journalAIOBufferTimeout = timeout; + this.journalBufferTimeout = timeout; } - public int getAIOBufferTimeout() + public int getJournalBufferTimeout() { - return journalAIOBufferTimeout; + return journalBufferTimeout; } - public void setAIOFlushOnSync(boolean flush) + public void setJournalFlushOnSync(boolean flush) { - journalAIOFlushSync = flush; + journalFlushSync = flush; } - public boolean isAIOFlushOnSync() + public boolean isJournalFlushOnSync() { - return journalAIOFlushSync; + return journalFlushSync; } - public int getAIOBufferSize() + public int getJournalBufferSize() { - return journalAIOBufferSize; + return journalBufferSize; } - public void setAIOBufferSize(int size) + public void setJournalBufferSize(int size) { - this.journalAIOBufferSize = size; + this.journalBufferSize = size; } public String getLargeMessagesDirectory() @@ -983,11 +983,11 @@ return false; if (jmxManagementEnabled != other.jmxManagementEnabled) return false; - if (journalAIOBufferSize != other.journalAIOBufferSize) + if (journalBufferSize != other.journalBufferSize) return false; - if (journalAIOBufferTimeout != other.journalAIOBufferTimeout) + if (journalBufferTimeout != other.journalBufferTimeout) return false; - if (journalAIOFlushSync != other.journalAIOFlushSync) + if (journalFlushSync != other.journalFlushSync) return false; if (journalCompactMinFiles != other.journalCompactMinFiles) return false; Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -335,11 +335,11 @@ journalFileSize = getInteger(e, "journal-file-size", journalFileSize, GT_ZERO); - journalAIOFlushSync = getBoolean(e, "journal-aio-flush-on-sync", DEFAULT_JOURNAL_AIO_FLUSH_SYNC); + journalFlushSync = getBoolean(e, "journal-flush-on-sync", DEFAULT_JOURNAL_FLUSH_SYNC); - journalAIOBufferTimeout = getInteger(e, "journal-aio-buffer-timeout", DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT, GT_ZERO); + journalBufferTimeout = getInteger(e, "journal-buffer-timeout", DEFAULT_JOURNAL_BUFFER_TIMEOUT, GT_ZERO); - journalAIOBufferSize = getInteger(e, "journal-aio-buffer-size", DEFAULT_JOURNAL_AIO_BUFFER_SIZE, GT_ZERO); + journalBufferSize = getInteger(e, "journal-buffer-size", DEFAULT_JOURNAL_BUFFER_SIZE, GT_ZERO); journalMinFiles = getInteger(e, "journal-min-files", journalMinFiles, GT_ZERO); Modified: trunk/src/main/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/src/main/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -63,9 +63,9 @@ public AIOSequentialFileFactory(final String journalDir) { this(journalDir, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_FLUSH_SYNC, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT, + ConfigurationImpl.DEFAULT_JOURNAL_FLUSH_SYNC, false); } Modified: trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFileFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFileFactory.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFileFactory.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -37,9 +37,9 @@ { this(journalDir, false, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_FLUSH_SYNC, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT, + ConfigurationImpl.DEFAULT_JOURNAL_FLUSH_SYNC, false); } @@ -47,9 +47,9 @@ { this(journalDir, buffered, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_FLUSH_SYNC, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT, + ConfigurationImpl.DEFAULT_JOURNAL_FLUSH_SYNC, false); } Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -151,12 +151,12 @@ public int getAIOBufferSize() { - return configuration.getAIOBufferSize(); + return configuration.getJournalBufferSize(); } public int getAIOBufferTimeout() { - return configuration.getAIOBufferTimeout(); + return configuration.getJournalBufferTimeout(); } public String getJournalDirectory() Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -229,17 +229,17 @@ log.warn("AIO wasn't located on this platform, it will fall back to using pure Java NIO. " + "If your platform is Linux, install LibAIO to enable the AIO journal"); journalFF = new NIOSequentialFileFactory(journalDir, true, - config.getAIOBufferSize(), - config.getAIOBufferTimeout(), - config.isAIOFlushOnSync(), + config.getJournalBufferSize(), + config.getJournalBufferTimeout(), + config.isJournalFlushOnSync(), config.isLogJournalWriteRate()); } else { journalFF = new AIOSequentialFileFactory(journalDir, - config.getAIOBufferSize(), - config.getAIOBufferTimeout(), - config.isAIOFlushOnSync(), + config.getJournalBufferSize(), + config.getJournalBufferTimeout(), + config.isJournalFlushOnSync(), config.isLogJournalWriteRate()); log.info("AIO loaded successfully"); } Modified: trunk/tests/config/ConfigurationTest-full-config.xml =================================================================== --- trunk/tests/config/ConfigurationTest-full-config.xml 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/tests/config/ConfigurationTest-full-config.xml 2009-11-12 21:08:49 UTC (rev 8277) @@ -37,11 +37,11 @@ <journal-directory>somedir2</journal-directory> <create-journal-dir>false</create-journal-dir> <journal-type>NIO</journal-type> - <journal-aio-flush-on-sync>true</journal-aio-flush-on-sync> <journal-compact-min-files>123</journal-compact-min-files> <journal-compact-percentage>33</journal-compact-percentage> - <journal-aio-buffer-timeout>1000</journal-aio-buffer-timeout> - <journal-aio-buffer-size>10000</journal-aio-buffer-size> + <journal-flush-on-sync>true</journal-flush-on-sync> + <journal-buffer-timeout>1000</journal-buffer-timeout> + <journal-buffer-size>10000</journal-buffer-size> <journal-sync-transactional>false</journal-sync-transactional> <journal-sync-non-transactional>true</journal-sync-non-transactional> <journal-file-size>12345678</journal-file-size> Modified: trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -63,7 +63,7 @@ file.mkdir(); return new AIOSequentialFileFactory(getTestDir(), - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE, 1000000, true, false Modified: trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -70,7 +70,7 @@ file.mkdir(); return new AIOSequentialFileFactory(getTestDir(), - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE, 1000000, true, false Modified: trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -388,9 +388,9 @@ if (factoryType.equals("aio")) { return new AIOSequentialFileFactory(directory, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT, - ConfigurationImpl.DEFAULT_JOURNAL_AIO_FLUSH_SYNC, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE, + ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT, + ConfigurationImpl.DEFAULT_JOURNAL_FLUSH_SYNC, false); } else Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -107,8 +107,8 @@ assertEquals(conf.getJournalFileSize(), serverControl.getJournalFileSize()); assertEquals(conf.getJournalMinFiles(), serverControl.getJournalMinFiles()); assertEquals(conf.getJournalMaxAIO(), serverControl.getJournalMaxAIO()); - assertEquals(conf.getAIOBufferSize(), serverControl.getAIOBufferSize()); - assertEquals(conf.getAIOBufferTimeout(), serverControl.getAIOBufferTimeout()); + assertEquals(conf.getJournalBufferSize(), serverControl.getAIOBufferSize()); + assertEquals(conf.getJournalBufferTimeout(), serverControl.getAIOBufferTimeout()); assertEquals(conf.isCreateBindingsDir(), serverControl.isCreateBindingsDir()); assertEquals(conf.isCreateJournalDir(), serverControl.isCreateJournalDir()); assertEquals(conf.getPagingDirectory(), serverControl.getPagingDirectory()); Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -82,8 +82,8 @@ assertEquals(ConfigurationImpl.DEFAULT_PAGING_DIR, conf.getPagingDirectory()); assertEquals(ConfigurationImpl.DEFAULT_LARGE_MESSAGES_DIR, conf.getLargeMessagesDirectory()); assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_COMPACT_PERCENTAGE, conf.getJournalCompactPercentage()); - assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_AIO_FLUSH_SYNC, conf.isAIOFlushOnSync()); - assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT, conf.getAIOBufferTimeout()); + assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_FLUSH_SYNC, conf.isJournalFlushOnSync()); + assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT, conf.getJournalBufferTimeout()); assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE, conf.isLogJournalWriteRate()); assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_PERF_BLAST_PAGES, conf.getJournalPerfBlastPages()); assertEquals(ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_ENABLED, conf.isMessageCounterEnabled()); @@ -244,16 +244,16 @@ assertEquals(i, conf.getJournalCompactPercentage()); i = randomInt(); - conf.setAIOBufferSize(i); - assertEquals(i, conf.getAIOBufferSize()); + conf.setJournalBufferSize(i); + assertEquals(i, conf.getJournalBufferSize()); i = randomInt(); - conf.setAIOBufferTimeout(i); - assertEquals(i, conf.getAIOBufferTimeout()); + conf.setJournalBufferTimeout(i); + assertEquals(i, conf.getJournalBufferTimeout()); b = randomBoolean(); - conf.setAIOFlushOnSync(b); - assertEquals(b, conf.isAIOFlushOnSync()); + conf.setJournalFlushOnSync(b); + assertEquals(b, conf.isJournalFlushOnSync()); b = randomBoolean(); conf.setLogJournalWriteRate(b); @@ -461,16 +461,16 @@ assertEquals(i, conf.getJournalCompactPercentage()); i = randomInt(); - conf.setAIOBufferSize(i); - assertEquals(i, conf.getAIOBufferSize()); + conf.setJournalBufferSize(i); + assertEquals(i, conf.getJournalBufferSize()); i = randomInt(); - conf.setAIOBufferTimeout(i); - assertEquals(i, conf.getAIOBufferTimeout()); + conf.setJournalBufferTimeout(i); + assertEquals(i, conf.getJournalBufferTimeout()); b = randomBoolean(); - conf.setAIOFlushOnSync(b); - assertEquals(b, conf.isAIOFlushOnSync()); + conf.setJournalFlushOnSync(b); + assertEquals(b, conf.isJournalFlushOnSync()); b = randomBoolean(); conf.setLogJournalWriteRate(b); Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -107,9 +107,9 @@ assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_MAX_AIO, conf.getJournalMaxAIO()); - assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_TIMEOUT, conf.getAIOBufferTimeout()); + assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT, conf.getJournalBufferTimeout()); - assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_AIO_BUFFER_SIZE, conf.getAIOBufferSize()); + assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE, conf.getJournalBufferSize()); assertEquals(ConfigurationImpl.DEFAULT_CREATE_BINDINGS_DIR, conf.isCreateBindingsDir()); Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2009-11-12 16:13:22 UTC (rev 8276) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2009-11-12 21:08:49 UTC (rev 8277) @@ -70,9 +70,9 @@ assertEquals("somedir2", conf.getJournalDirectory()); assertEquals(false, conf.isCreateJournalDir()); assertEquals(JournalType.NIO, conf.getJournalType()); - assertEquals(10000, conf.getAIOBufferSize()); - assertEquals(true, conf.isAIOFlushOnSync()); - assertEquals(1000, conf.getAIOBufferTimeout()); + assertEquals(10000, conf.getJournalBufferSize()); + assertEquals(true, conf.isJournalFlushOnSync()); + assertEquals(1000, conf.getJournalBufferTimeout()); assertEquals(false, conf.isJournalSyncTransactional()); assertEquals(true, conf.isJournalSyncNonTransactional()); assertEquals(12345678, conf.getJournalFileSize());