[jboss-cvs] JBoss Messaging SVN: r7114 - branches/Branch_JBM2_Perf_Clebert.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 28 18:00:07 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-05-28 18:00:07 -0400 (Thu, 28 May 2009)
New Revision: 7114
Modified:
branches/Branch_JBM2_Perf_Clebert/revert-aio.patch
Log:
tweak
Modified: branches/Branch_JBM2_Perf_Clebert/revert-aio.patch
===================================================================
--- branches/Branch_JBM2_Perf_Clebert/revert-aio.patch 2009-05-28 21:58:45 UTC (rev 7113)
+++ branches/Branch_JBM2_Perf_Clebert/revert-aio.patch 2009-05-28 22:00:07 UTC (rev 7114)
@@ -359,6 +359,10 @@
+#define _VERSION_NATIVE_AIO 17
#endif
+Index: native/bin/libJBMLibAIO64.so
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java
===================================================================
--- src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java (revision 7105)
@@ -2376,350 +2380,369 @@
public void testBlockCallback() throws Exception
Index: revert-aio.patch
===================================================================
---- revert-aio.patch (revision 7106)
+--- revert-aio.patch (revision 7112)
+++ revert-aio.patch (working copy)
-@@ -359,23 +359,6 @@
+@@ -359,6 +359,10 @@
+#define _VERSION_NATIVE_AIO 17
#endif
--Index: native/bin/libJBMLibAIO64.so
--===================================================================
--Cannot display: file marked as a binary type.
--svn:mime-type = application/octet-stream
--Index: src/main/org/jboss/messaging/core/buffers/ByteBufferBackedChannelBuffer.java
--===================================================================
----- src/main/org/jboss/messaging/core/buffers/ByteBufferBackedChannelBuffer.java (revision 7105)
--+++ src/main/org/jboss/messaging/core/buffers/ByteBufferBackedChannelBuffer.java (working copy)
--@@ -60,7 +60,7 @@
-- throw new NullPointerException("buffer");
-- }
--
--- this.buffer = buffer;
--+ this.buffer = buffer.slice();
-- capacity = buffer.remaining();
-- }
--
++Index: native/bin/libJBMLibAIO64.so
++===================================================================
++Cannot display: file marked as a binary type.
++svn:mime-type = application/octet-stream
Index: src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java
===================================================================
--- src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java (revision 7105)
-@@ -1460,7 +1443,7 @@
-
- if (buffer == null)
- {
--@@ -2467,41 +2434,24 @@
-+@@ -2467,42 +2434,29 @@
-
- fileFactory.clearBuffer(buffer);
- }
-@@ -1507,8 +1490,13 @@
- - }
- + reuseBuffers.offer(buffer);
- }
-++ else
-++ {
-++ System.out.println("Throwing buffer away");
-++ }
- }
- }
-+ }
- Index: src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java
- ===================================================================
- --- src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java (revision 7105)
-@@ -1542,48 +1530,6 @@
- int getAlignment() throws Exception;
-
- int calculateBlockStart(int position) throws Exception;
--Index: src/config/stand-alone/non-clustered/jbm-configuration.xml
--===================================================================
----- src/config/stand-alone/non-clustered/jbm-configuration.xml (revision 7105)
--+++ src/config/stand-alone/non-clustered/jbm-configuration.xml (working copy)
--@@ -56,4 +56,37 @@
-- </address-settings>
--
--
--+<<<<<<< .working
-- </configuration>
--+=======
--+ <journal-directory>data/journal</journal-directory>
--+
--+ <create-journal-dir>true</create-journal-dir>
--+
--+ <journal-type>NIO</journal-type>
--+
--+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
--+ Set this to -1 to disable this feature -->
--+ <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
--+
--+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
--+ <journal-sync-transactional>true</journal-sync-transactional>
--+
--+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
--+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
--+
--+ <!-- 10 MB journal file size -->
--+ <journal-file-size>10485760</journal-file-size>
--+
--+ <journal-min-files>15</journal-min-files>
--+
--+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
--+ (parameter ignored on NIO)
--+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
--+ -->
--+ <journal-max-aio>10000</journal-max-aio>
--+
--+ </configuration>
--+
--+</deployment>
--+>>>>>>> .merge-right.r6682
- Index: tests/src/org/jboss/messaging/tests/unit/core/asyncio/AsynchronousFileTest.java
- ===================================================================
- --- tests/src/org/jboss/messaging/tests/unit/core/asyncio/AsynchronousFileTest.java (revision 7105)
-@@ -2416,190 +2362,11 @@
- protected abstract int getAlignment();
-
- }
--Index: tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java (working copy)
--@@ -202,7 +202,7 @@
-- {
-- Journal journal =
-- new JournalImpl(10 * 1024 * 1024, 10, true, true, getFileFactory(),
--- "jbm-data", "jbm", 5000, 10 * 1024);
--+ "jbm-data", "jbm", 5000, 0);
--
-- journal.start();
--
--Index: tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java (working copy)
--@@ -882,11 +882,9 @@
-- configuration.setSecurityEnabled(false);
-- configuration.setBindingsDirectory(getBindingsDir(node, backup));
-- configuration.setJournalMinFiles(2);
--- configuration.setJournalMaxAIO(1000);
-- configuration.setJournalDirectory(getJournalDir(node, backup));
-- configuration.setJournalFileSize(100 * 1024);
--- configuration.setJournalType(JournalType.ASYNCIO);
--- configuration.setJournalMaxAIO(1000);
--+ configuration.setJournalType(JournalType.NIO);
-- configuration.setPagingDirectory(getPageDir(node, backup));
-- configuration.setLargeMessagesDirectory(getLargeMessagesDir(node, backup));
-- configuration.setClustered(true);
--@@ -980,8 +978,7 @@
-- configuration.setJournalMinFiles(2);
-- configuration.setJournalDirectory(getJournalDir(node, false));
-- configuration.setJournalFileSize(100 * 1024);
--- configuration.setJournalType(JournalType.ASYNCIO);
--- configuration.setJournalMaxAIO(1000);
--+ configuration.setJournalType(JournalType.NIO);
-- configuration.setPagingDirectory(getPageDir(node, false));
-- configuration.setLargeMessagesDirectory(getLargeMessagesDir(node, false));
-- configuration.setClustered(true);
--Index: tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java (working copy)
--@@ -103,7 +103,7 @@
-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
-- backupConf.setJournalFileSize(100 * 1024);
--
--- backupConf.setJournalType(JournalType.ASYNCIO);
--+ backupConf.setJournalType(JournalType.NIO);
--
-- backupConf.setSecurityEnabled(false);
-- backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
--@@ -124,7 +124,7 @@
--
-- liveConf.setJournalFileSize(100 * 1024);
--
--- liveConf.setJournalType(JournalType.ASYNCIO);
--+ liveConf.setJournalType(JournalType.NIO);
--
--
-- liveConf.setSecurityEnabled(false);
--Index: tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java (working copy)
--@@ -386,7 +386,7 @@
-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
-- backupConf.setJournalFileSize(100 * 1024);
--
--- backupConf.setJournalType(JournalType.ASYNCIO);
--+ backupConf.setJournalType(JournalType.NIO);
--
-- backupConf.setPagingMaxGlobalSizeBytes(maxGlobalSize);
-- backupConf.setGlobalPagingSize(pageSize);
--@@ -426,7 +426,7 @@
-- liveConf.setGlobalPagingSize(pageSize);
-- liveConf.setJournalFileSize(100 * 1024);
--
--- liveConf.setJournalType(JournalType.ASYNCIO);
--+ liveConf.setJournalType(JournalType.NIO);
-- }
--
-- if (fileBased)
--Index: tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java (working copy)
--@@ -124,7 +124,7 @@
-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
-- backupConf.setJournalFileSize(100 * 1024);
--
--- backupConf.setJournalType(JournalType.ASYNCIO);
--+ backupConf.setJournalType(JournalType.NIO);
--
-- backupConf.setPagingMaxGlobalSizeBytes(maxGlobalSize);
-- backupConf.setGlobalPagingSize(pageSize);
--@@ -164,7 +164,7 @@
-- liveConf.setGlobalPagingSize(pageSize);
-- liveConf.setJournalFileSize(100 * 1024);
--
--- liveConf.setJournalType(JournalType.ASYNCIO);
--+ liveConf.setJournalType(JournalType.NIO);
-- }
--
-- if (fileBased)
--@@ -208,7 +208,7 @@
-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
-- backupConf.setJournalFileSize(100 * 1024);
--
--- backupConf.setJournalType(JournalType.ASYNCIO);
--+ backupConf.setJournalType(JournalType.NIO);
--
-- backupConf.setPagingMaxGlobalSizeBytes(-1);
-- backupConf.setGlobalPagingSize(-1);
--@@ -263,7 +263,7 @@
-- liveConf.setGlobalPagingSize(-1);
-- liveConf.setJournalFileSize(100 * 1024);
--
--- liveConf.setJournalType(JournalType.ASYNCIO);
--+ liveConf.setJournalType(JournalType.NIO);
-- liveServer = Messaging.newMessagingServer(liveConf);
-- }
-- else
--Index: tests/src/org/jboss/messaging/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java (working copy)
--@@ -85,7 +85,7 @@
-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
-- backupConf.setJournalFileSize(100 * 1024);
--
--- backupConf.setJournalType(JournalType.ASYNCIO);
--+ backupConf.setJournalType(JournalType.NIO);
--
-- backupConf.setSecurityEnabled(false);
-- backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
--@@ -106,7 +106,7 @@
--
-- liveConf.setJournalFileSize(100 * 1024);
--
--- liveConf.setJournalType(JournalType.ASYNCIO);
--+ liveConf.setJournalType(JournalType.NIO);
--
-- liveConf.setSecurityEnabled(false);
-- liveConf.getAcceptorConfigurations()
--Index: tests/src/org/jboss/messaging/tests/integration/persistence/JournalStorageManagerIntegrationTest.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/integration/persistence/JournalStorageManagerIntegrationTest.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/integration/persistence/JournalStorageManagerIntegrationTest.java (working copy)
--@@ -60,7 +60,7 @@
--
-- configuration.start();
--
--- configuration.setJournalType(JournalType.ASYNCIO);
--+ configuration.setJournalType(JournalType.NIO);
--
-- final JournalStorageManager journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
-- journal.start();
--Index: tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java (working copy)
--@@ -23,6 +23,7 @@
-- package org.jboss.messaging.tests.integration.journal;
--
-- import java.io.File;
--+import java.util.concurrent.Executors;
--
-- import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
-- import org.jboss.messaging.core.journal.SequentialFileFactory;
- Index: tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java
- ===================================================================
- --- tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java (revision 7105)
- +++ tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java (working copy)
--@@ -25,6 +25,7 @@
-- import java.io.File;
-- import java.nio.ByteBuffer;
-- import java.util.concurrent.CountDownLatch;
--+import java.util.concurrent.Executors;
-- import java.util.concurrent.atomic.AtomicInteger;
--
-- import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
--@@ -77,7 +78,6 @@
-+@@ -77,7 +77,6 @@
- ByteBuffer buff = factory.newBuffer(10);
- assertEquals(512, buff.limit());
- file.close();
-@@ -2607,56 +2374,3 @@
+@@ -2374,352 +2378,3 @@
}
public void testBlockCallback() throws Exception
--@@ -131,7 +131,7 @@
--
-- BlockCallback callback = new BlockCallback();
--
--- final int NUMBER_OF_RECORDS = 500;
--+ final int NUMBER_OF_RECORDS = 10000;
--
-- SequentialFile file = factory.createSequentialFile("callbackBlock.log", 1000);
-- file.open();
--Index: tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java
+-Index: revert-aio.patch
-===================================================================
----- tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java (working copy)
--@@ -321,7 +321,7 @@
-- config.setJournalFileSize(10 * 1024 * 1024);
-- config.setJournalMinFiles(5);
--
--- config.setJournalType(JournalType.ASYNCIO);
--+ config.setJournalType(JournalType.NIO);
--
-- return config;
-- }
--Index: tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
--===================================================================
----- tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java (revision 7105)
--+++ tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java (working copy)
--@@ -126,7 +126,7 @@
-- Configuration config = new ConfigurationImpl();
-- config.setJournalDirectory(getJournalDir());
-- config.setBindingsDirectory(getBindingsDir());
--- config.setJournalType(JournalType.ASYNCIO);
--+ config.setJournalType(JournalType.NIO);
-- config.setLargeMessagesDirectory(getLargeMessagesDir());
-- return config;
-- }
--@@ -272,7 +272,7 @@
-- configuration.setJournalMinFiles(2);
-- configuration.setJournalDirectory(getJournalDir(index, false));
-- configuration.setJournalFileSize(100 * 1024);
--- configuration.setJournalType(JournalType.ASYNCIO);
--+ configuration.setJournalType(JournalType.NIO);
-- configuration.setPagingDirectory(getPageDir(index, false));
-- configuration.setLargeMessagesDirectory(getLargeMessagesDir(index, false));
--
--@@ -299,7 +299,7 @@
-- configuration.setPagingDirectory(getPageDir());
-- configuration.setLargeMessagesDirectory(getLargeMessagesDir());
--
--- configuration.setJournalType(JournalType.ASYNCIO);
--+ configuration.setJournalType(JournalType.NIO);
--
-- configuration.getAcceptorConfigurations().clear();
--
+---- revert-aio.patch (revision 7106)
+-+++ revert-aio.patch (working copy)
+-@@ -359,23 +359,6 @@
+- +#define _VERSION_NATIVE_AIO 17
+- #endif
+-
+--Index: native/bin/libJBMLibAIO64.so
+--===================================================================
+--Cannot display: file marked as a binary type.
+--svn:mime-type = application/octet-stream
+--Index: src/main/org/jboss/messaging/core/buffers/ByteBufferBackedChannelBuffer.java
+--===================================================================
+----- src/main/org/jboss/messaging/core/buffers/ByteBufferBackedChannelBuffer.java (revision 7105)
+--+++ src/main/org/jboss/messaging/core/buffers/ByteBufferBackedChannelBuffer.java (working copy)
+--@@ -60,7 +60,7 @@
+-- throw new NullPointerException("buffer");
+-- }
+--
+--- this.buffer = buffer;
+--+ this.buffer = buffer.slice();
+-- capacity = buffer.remaining();
+-- }
+--
+- Index: src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java
+- ===================================================================
+- --- src/main/org/jboss/messaging/core/asyncio/impl/AsynchronousFileImpl.java (revision 7105)
+-@@ -1460,7 +1443,7 @@
+-
+- if (buffer == null)
+- {
+--@@ -2467,41 +2434,24 @@
+-+@@ -2467,42 +2434,29 @@
+-
+- fileFactory.clearBuffer(buffer);
+- }
+-@@ -1507,8 +1490,13 @@
+- - }
+- + reuseBuffers.offer(buffer);
+- }
+-++ else
+-++ {
+-++ System.out.println("Throwing buffer away");
+-++ }
+- }
+- }
+-+ }
+- Index: src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java
+- ===================================================================
+- --- src/main/org/jboss/messaging/core/journal/SequentialFileFactory.java (revision 7105)
+-@@ -1542,48 +1530,6 @@
+- int getAlignment() throws Exception;
+-
+- int calculateBlockStart(int position) throws Exception;
+--Index: src/config/stand-alone/non-clustered/jbm-configuration.xml
+--===================================================================
+----- src/config/stand-alone/non-clustered/jbm-configuration.xml (revision 7105)
+--+++ src/config/stand-alone/non-clustered/jbm-configuration.xml (working copy)
+--@@ -56,4 +56,37 @@
+-- </address-settings>
+--
+--
+--+<<<<<<< .working
+-- </configuration>
+--+=======
+--+ <journal-directory>data/journal</journal-directory>
+--+
+--+ <create-journal-dir>true</create-journal-dir>
+--+
+--+ <journal-type>NIO</journal-type>
+--+
+--+ <!-- The journal will reuse any buffers where the size < journal-buffer-reuse-size on write operations
+--+ Set this to -1 to disable this feature -->
+--+ <journal-buffer-reuse-size>1536</journal-buffer-reuse-size>
+--+
+--+ <!-- Does the journal sync to disk on each transaction commit, prepare or rollback? -->
+--+ <journal-sync-transactional>true</journal-sync-transactional>
+--+
+--+ <!-- Does the journal sync to disk for every non transactional persistent operation? -->
+--+ <journal-sync-non-transactional>false</journal-sync-non-transactional>
+--+
+--+ <!-- 10 MB journal file size -->
+--+ <journal-file-size>10485760</journal-file-size>
+--+
+--+ <journal-min-files>15</journal-min-files>
+--+
+--+ <!-- Maximum simultaneous asynchronous writes accepted by the native layer.
+--+ (parameter ignored on NIO)
+--+ You can verify the max AIO on the OS level at /proc/sys/fs/aio_max_nr. (aio-nr will give you the current max-aio being used)
+--+ -->
+--+ <journal-max-aio>10000</journal-max-aio>
+--+
+--+ </configuration>
+--+
+--+</deployment>
+--+>>>>>>> .merge-right.r6682
+- Index: tests/src/org/jboss/messaging/tests/unit/core/asyncio/AsynchronousFileTest.java
+- ===================================================================
+- --- tests/src/org/jboss/messaging/tests/unit/core/asyncio/AsynchronousFileTest.java (revision 7105)
+-@@ -2416,190 +2362,11 @@
+- protected abstract int getAlignment();
+-
+- }
+--Index: tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/performance/journal/JournalImplTestUnit.java (working copy)
+--@@ -202,7 +202,7 @@
+-- {
+-- Journal journal =
+-- new JournalImpl(10 * 1024 * 1024, 10, true, true, getFileFactory(),
+--- "jbm-data", "jbm", 5000, 10 * 1024);
+--+ "jbm-data", "jbm", 5000, 0);
+--
+-- journal.start();
+--
+--Index: tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java (working copy)
+--@@ -882,11 +882,9 @@
+-- configuration.setSecurityEnabled(false);
+-- configuration.setBindingsDirectory(getBindingsDir(node, backup));
+-- configuration.setJournalMinFiles(2);
+--- configuration.setJournalMaxAIO(1000);
+-- configuration.setJournalDirectory(getJournalDir(node, backup));
+-- configuration.setJournalFileSize(100 * 1024);
+--- configuration.setJournalType(JournalType.ASYNCIO);
+--- configuration.setJournalMaxAIO(1000);
+--+ configuration.setJournalType(JournalType.NIO);
+-- configuration.setPagingDirectory(getPageDir(node, backup));
+-- configuration.setLargeMessagesDirectory(getLargeMessagesDir(node, backup));
+-- configuration.setClustered(true);
+--@@ -980,8 +978,7 @@
+-- configuration.setJournalMinFiles(2);
+-- configuration.setJournalDirectory(getJournalDir(node, false));
+-- configuration.setJournalFileSize(100 * 1024);
+--- configuration.setJournalType(JournalType.ASYNCIO);
+--- configuration.setJournalMaxAIO(1000);
+--+ configuration.setJournalType(JournalType.NIO);
+-- configuration.setPagingDirectory(getPageDir(node, false));
+-- configuration.setLargeMessagesDirectory(getLargeMessagesDir(node, false));
+-- configuration.setClustered(true);
+--Index: tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java (working copy)
+--@@ -103,7 +103,7 @@
+-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
+-- backupConf.setJournalFileSize(100 * 1024);
+--
+--- backupConf.setJournalType(JournalType.ASYNCIO);
+--+ backupConf.setJournalType(JournalType.NIO);
+--
+-- backupConf.setSecurityEnabled(false);
+-- backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
+--@@ -124,7 +124,7 @@
+--
+-- liveConf.setJournalFileSize(100 * 1024);
+--
+--- liveConf.setJournalType(JournalType.ASYNCIO);
+--+ liveConf.setJournalType(JournalType.NIO);
+--
+--
+-- liveConf.setSecurityEnabled(false);
+--Index: tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java (working copy)
+--@@ -386,7 +386,7 @@
+-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
+-- backupConf.setJournalFileSize(100 * 1024);
+--
+--- backupConf.setJournalType(JournalType.ASYNCIO);
+--+ backupConf.setJournalType(JournalType.NIO);
+--
+-- backupConf.setPagingMaxGlobalSizeBytes(maxGlobalSize);
+-- backupConf.setGlobalPagingSize(pageSize);
+--@@ -426,7 +426,7 @@
+-- liveConf.setGlobalPagingSize(pageSize);
+-- liveConf.setJournalFileSize(100 * 1024);
+--
+--- liveConf.setJournalType(JournalType.ASYNCIO);
+--+ liveConf.setJournalType(JournalType.NIO);
+-- }
+--
+-- if (fileBased)
+--Index: tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java (working copy)
+--@@ -124,7 +124,7 @@
+-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
+-- backupConf.setJournalFileSize(100 * 1024);
+--
+--- backupConf.setJournalType(JournalType.ASYNCIO);
+--+ backupConf.setJournalType(JournalType.NIO);
+--
+-- backupConf.setPagingMaxGlobalSizeBytes(maxGlobalSize);
+-- backupConf.setGlobalPagingSize(pageSize);
+--@@ -164,7 +164,7 @@
+-- liveConf.setGlobalPagingSize(pageSize);
+-- liveConf.setJournalFileSize(100 * 1024);
+--
+--- liveConf.setJournalType(JournalType.ASYNCIO);
+--+ liveConf.setJournalType(JournalType.NIO);
+-- }
+--
+-- if (fileBased)
+--@@ -208,7 +208,7 @@
+-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
+-- backupConf.setJournalFileSize(100 * 1024);
+--
+--- backupConf.setJournalType(JournalType.ASYNCIO);
+--+ backupConf.setJournalType(JournalType.NIO);
+--
+-- backupConf.setPagingMaxGlobalSizeBytes(-1);
+-- backupConf.setGlobalPagingSize(-1);
+--@@ -263,7 +263,7 @@
+-- liveConf.setGlobalPagingSize(-1);
+-- liveConf.setJournalFileSize(100 * 1024);
+--
+--- liveConf.setJournalType(JournalType.ASYNCIO);
+--+ liveConf.setJournalType(JournalType.NIO);
+-- liveServer = Messaging.newMessagingServer(liveConf);
+-- }
+-- else
+--Index: tests/src/org/jboss/messaging/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java (working copy)
+--@@ -85,7 +85,7 @@
+-- backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
+-- backupConf.setJournalFileSize(100 * 1024);
+--
+--- backupConf.setJournalType(JournalType.ASYNCIO);
+--+ backupConf.setJournalType(JournalType.NIO);
+--
+-- backupConf.setSecurityEnabled(false);
+-- backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
+--@@ -106,7 +106,7 @@
+--
+-- liveConf.setJournalFileSize(100 * 1024);
+--
+--- liveConf.setJournalType(JournalType.ASYNCIO);
+--+ liveConf.setJournalType(JournalType.NIO);
+--
+-- liveConf.setSecurityEnabled(false);
+-- liveConf.getAcceptorConfigurations()
+--Index: tests/src/org/jboss/messaging/tests/integration/persistence/JournalStorageManagerIntegrationTest.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/integration/persistence/JournalStorageManagerIntegrationTest.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/integration/persistence/JournalStorageManagerIntegrationTest.java (working copy)
+--@@ -60,7 +60,7 @@
+--
+-- configuration.start();
+--
+--- configuration.setJournalType(JournalType.ASYNCIO);
+--+ configuration.setJournalType(JournalType.NIO);
+--
+-- final JournalStorageManager journal = new JournalStorageManager(configuration, Executors.newCachedThreadPool());
+-- journal.start();
+--Index: tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/integration/journal/RealAIOJournalImplTest.java (working copy)
+--@@ -23,6 +23,7 @@
+-- package org.jboss.messaging.tests.integration.journal;
+--
+-- import java.io.File;
+--+import java.util.concurrent.Executors;
+--
+-- import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
+-- import org.jboss.messaging.core.journal.SequentialFileFactory;
+- Index: tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java
+- ===================================================================
+- --- tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java (revision 7105)
+- +++ tests/src/org/jboss/messaging/tests/integration/journal/AIOSequentialFileFactoryTest.java (working copy)
+--@@ -25,6 +25,7 @@
+-- import java.io.File;
+-- import java.nio.ByteBuffer;
+-- import java.util.concurrent.CountDownLatch;
+--+import java.util.concurrent.Executors;
+-- import java.util.concurrent.atomic.AtomicInteger;
+--
+-- import org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl;
+--@@ -77,7 +78,6 @@
+-+@@ -77,7 +77,6 @@
+- ByteBuffer buff = factory.newBuffer(10);
+- assertEquals(512, buff.limit());
+- file.close();
+-@@ -2607,56 +2374,3 @@
+- }
+-
+- public void testBlockCallback() throws Exception
+--@@ -131,7 +131,7 @@
+--
+-- BlockCallback callback = new BlockCallback();
+--
+--- final int NUMBER_OF_RECORDS = 500;
+--+ final int NUMBER_OF_RECORDS = 10000;
+--
+-- SequentialFile file = factory.createSequentialFile("callbackBlock.log", 1000);
+-- file.open();
+--Index: tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/stress/paging/PageStressTest.java (working copy)
+--@@ -321,7 +321,7 @@
+-- config.setJournalFileSize(10 * 1024 * 1024);
+-- config.setJournalMinFiles(5);
+--
+--- config.setJournalType(JournalType.ASYNCIO);
+--+ config.setJournalType(JournalType.NIO);
+--
+-- return config;
+-- }
+--Index: tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
+--===================================================================
+----- tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java (revision 7105)
+--+++ tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java (working copy)
+--@@ -126,7 +126,7 @@
+-- Configuration config = new ConfigurationImpl();
+-- config.setJournalDirectory(getJournalDir());
+-- config.setBindingsDirectory(getBindingsDir());
+--- config.setJournalType(JournalType.ASYNCIO);
+--+ config.setJournalType(JournalType.NIO);
+-- config.setLargeMessagesDirectory(getLargeMessagesDir());
+-- return config;
+-- }
+--@@ -272,7 +272,7 @@
+-- configuration.setJournalMinFiles(2);
+-- configuration.setJournalDirectory(getJournalDir(index, false));
+-- configuration.setJournalFileSize(100 * 1024);
+--- configuration.setJournalType(JournalType.ASYNCIO);
+--+ configuration.setJournalType(JournalType.NIO);
+-- configuration.setPagingDirectory(getPageDir(index, false));
+-- configuration.setLargeMessagesDirectory(getLargeMessagesDir(index, false));
+--
+--@@ -299,7 +299,7 @@
+-- configuration.setPagingDirectory(getPageDir());
+-- configuration.setLargeMessagesDirectory(getLargeMessagesDir());
+--
+--- configuration.setJournalType(JournalType.ASYNCIO);
+--+ configuration.setJournalType(JournalType.NIO);
+--
+-- configuration.getAcceptorConfigurations().clear();
+--
More information about the jboss-cvs-commits
mailing list