[jboss-cvs] JBoss Messaging SVN: r3202 - in trunk: src/etc/xmdesc and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 19 07:36:28 EDT 2007
Author: timfox
Date: 2007-10-19 07:36:27 -0400 (Fri, 19 Oct 2007)
New Revision: 3202
Modified:
trunk/src/etc/server/default/deploy/db2-persistence-service.xml
trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml
trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java
trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java
trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
Log:
Sync reap
Modified: trunk/src/etc/server/default/deploy/db2-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-19 11:36:27 UTC (rev 3202)
@@ -84,7 +84,14 @@
<attribute name="MaxParams">500</attribute>
+ <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
+
<attribute name="ReaperPeriod">5000</attribute>
+
+ <!-- The number of messages to do a synchronous reap after, or zero for asynchronous reaping -->
+
+ <attribute name="SynchronousReapMessages">0</attribute>
+
</mbean>
<!-- Messaging Post Office MBean configuration
@@ -118,7 +125,7 @@
DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
]]></attribute>
-
+
<!-- This post office is clustered. If you don't want a clustered post office then set to false -->
<attribute name="Clustered">true</attribute>
Modified: trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-19 11:36:27 UTC (rev 3202)
@@ -87,7 +87,13 @@
<attribute name="MaxParams">500</attribute>
+ <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
+
<attribute name="ReaperPeriod">5000</attribute>
+
+ <!-- The number of messages to do a synchronous reap after, or zero for asynchronous reaping -->
+
+ <attribute name="SynchronousReapMessages">0</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
@@ -120,7 +126,7 @@
INSERT_BINDING=INSERT INTO JBM_POSTOFFICE (POSTOFFICE_NAME, NODE_ID, QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLSTERED, ALL_NODES) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
- ]]></attribute>
+ ]]></attribute>
<!-- This post office is clustered. If you don't want a clustered post office then set to false -->
Modified: trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-19 11:36:27 UTC (rev 3202)
@@ -87,7 +87,13 @@
<attribute name="MaxParams">500</attribute>
+ <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
+
<attribute name="ReaperPeriod">5000</attribute>
+
+ <!-- The number of messages to do a synchronous reap after, or zero for asynchronous reaping -->
+
+ <attribute name="SynchronousReapMessages">0</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
@@ -121,7 +127,7 @@
DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
]]></attribute>
-
+
<!-- This post office is clustered. If you don't want a clustered post office then set to false -->
<attribute name="Clustered">true</attribute>
Modified: trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-19 11:36:27 UTC (rev 3202)
@@ -87,7 +87,14 @@
<attribute name="MaxParams">500</attribute>
+ <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
+
<attribute name="ReaperPeriod">5000</attribute>
+
+ <!-- The number of messages to do a synchronous reap after, or zero for asynchronous reaping -->
+
+ <attribute name="SynchronousReapMessages">0</attribute>
+
</mbean>
<!-- Messaging Post Office MBean configuration
@@ -121,7 +128,7 @@
DELETE_BINDING=DELETE FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=? AND QUEUE_NAME=?
LOAD_BINDINGS=SELECT QUEUE_NAME, COND, SELECTOR, CHANNEL_ID, CLUSTERED, ALL_NODES FROM JBM_POSTOFFICE WHERE POSTOFFICE_NAME=? AND NODE_ID=?
]]></attribute>
-
+
<!-- This post office is clustered. If you don't want a clustered post office then set to false -->
<attribute name="Clustered">true</attribute>
Modified: trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-19 11:36:27 UTC (rev 3202)
@@ -87,7 +87,14 @@
<attribute name="MaxParams">500</attribute>
+ <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
+
<attribute name="ReaperPeriod">5000</attribute>
+
+ <!-- The number of messages to do a synchronous reap after, or zero for asynchronous reaping -->
+
+ <attribute name="SynchronousReapMessages">0</attribute>
+
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-10-19 11:36:27 UTC (rev 3202)
@@ -87,7 +87,13 @@
<attribute name="MaxParams">500</attribute>
+ <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
+
<attribute name="ReaperPeriod">5000</attribute>
+
+ <!-- The number of messages to do a synchronous reap after, or zero for asynchronous reaping -->
+
+ <attribute name="SynchronousReapMessages">0</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-10-19 11:36:27 UTC (rev 3202)
@@ -92,7 +92,13 @@
<attribute name="MaxParams">500</attribute>
+ <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
+
<attribute name="ReaperPeriod">5000</attribute>
+
+ <!-- The number of messages to do a synchronous reap after, or zero for asynchronous reaping -->
+
+ <attribute name="SynchronousReapMessages">0</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml
===================================================================
--- trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml 2007-10-19 11:36:27 UTC (rev 3202)
@@ -69,7 +69,13 @@
<description>The period in ms for the reaper to kick in and delete unreferenced messages from the database</description>
<name>ReaperPeriod</name>
<type>long</type>
- </attribute>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getSynchronousReapMessages" setMethod="setSynchronousReapMessages">
+ <description>The number of messages to synchronously force a reap after, or zero to reap asynchronously</description>
+ <name>SynchronousReapMessages</name>
+ <type>int</type>
+ </attribute>
<!-- Managed operations -->
Modified: trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -31,8 +31,8 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.sql.Types;
-import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -44,6 +44,7 @@
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
@@ -104,6 +105,10 @@
private long reaperPeriod;
private boolean reaperRunning;
+
+ private int synchronousReapMessages;
+
+ private AtomicInteger syncReapCount;
// Some versions of the oracle driver don't support binding blobs on select clauses,
// what would force us to use a two stage insert (insert and if successful, update)
@@ -114,7 +119,7 @@
public JDBCPersistenceManager(DataSource ds, TransactionManager tm, Properties sqlProperties,
boolean createTablesOnStartup, boolean usingBatchUpdates,
boolean usingBinaryStream, boolean usingTrailingByte, int maxParams,
- long reaperPeriod)
+ long reaperPeriod, int synchronousReapMessages)
{
super(ds, tm, sqlProperties, createTablesOnStartup);
@@ -128,9 +133,16 @@
this.reaperPeriod = reaperPeriod;
- reaperTimer = new Timer(true);
-
- reaper = new Reaper();
+ if (reaperPeriod > 0)
+ {
+ reaperTimer = new Timer(true);
+
+ reaper = new Reaper();
+ }
+ else
+ {
+ syncReapCount = new AtomicInteger(0);
+ }
}
@@ -258,7 +270,8 @@
{
return;
}
- if (reaperPeriod != -1)
+
+ if (reaper != null && reaperPeriod != -1)
{
reaperTimer.schedule(reaper, reaperPeriod, reaperPeriod);
@@ -272,9 +285,13 @@
{
return;
}
- reaper.cancel();
- reaperRunning = false;
+ if (reaper != null)
+ {
+ reaper.cancel();
+
+ reaperRunning = false;
+ }
}
public void reapUnreferencedMessages() throws Exception
@@ -646,7 +663,6 @@
//Maybe we need to persist the message itself
Message m = ref.getMessage();
-
rows = storeMessage(m, psInsertMessage, psUpdateMessage);
if (trace) { log.trace("Inserted " + rows + " rows"); }
@@ -690,6 +706,8 @@
removeReference(channelID, ref, psDeleteReference);
int rows = psDeleteReference.executeUpdate();
+
+ addToReapCount(rows);
if (trace) { log.trace("Deleted " + rows + " rows"); }
}
@@ -703,7 +721,9 @@
}
}
- new RemoveDepagedReferencesRunner().executeWithRetry();
+ new RemoveDepagedReferencesRunner().executeWithRetry();
+
+ checkReap();
}
// After loading paged refs this is used to update P messages to non paged
@@ -1284,7 +1304,9 @@
return null;
}
- if (trace) { log.trace("Deleted " + rows + " rows"); }
+ if (trace) { log.trace("Deleted " + rows + " rows"); }
+
+ incrementReapCount();
return null;
}
@@ -1308,6 +1330,8 @@
//No tx so we remove the reference directly from the db
new RemoveReferenceRunner().executeWithRetry();
+
+ checkReap();
}
}
@@ -1451,7 +1475,9 @@
int rows = psDeleteReference.executeUpdate();
- if (trace) { log.trace("Deleted " + rows + " rows"); }
+ if (trace) { log.trace("Deleted " + rows + " rows"); }
+
+ incrementReapCount();
}
return null;
@@ -1475,6 +1501,8 @@
}
}
new HandleBeforeCommit1PCRunner().executeWithRetry();
+
+ checkReap();
}
protected void handleBeforeCommit2PC(final Transaction tx) throws Exception
@@ -1506,6 +1534,8 @@
rows = ps.executeUpdate();
+ addToReapCount(rows);
+
if (trace) { log.trace(JDBCUtil.statementToString(getSQLStatement("COMMIT_MESSAGE_REF2"), new Long(tx.getId())) + " updated " + rows + " row(s)"); }
removeTXRecord(conn, tx);
@@ -1520,6 +1550,8 @@
}
new HandleBeforeCommit2PCRunner().executeWithRetry();
+
+ checkReap();
}
protected void handleBeforePrepare(final List refsToAdd, final List refsToRemove, final Transaction tx) throws Exception
@@ -1646,6 +1678,8 @@
int rows = ps.executeUpdate();
+ addToReapCount(rows);
+
if (trace)
{
log.trace(JDBCUtil.statementToString(getSQLStatement("ROLLBACK_MESSAGE_REF1"), new Long(tx.getId())) + " removed " + rows + " row(s)");
@@ -1676,6 +1710,8 @@
}
new HandleBeforeRollbackRunner().executeWithRetry();
+
+ checkReap();
}
@@ -2324,6 +2360,32 @@
return order;
}
+ private void incrementReapCount()
+ {
+ if (syncReapCount != null)
+ {
+ syncReapCount.incrementAndGet();
+ }
+ }
+
+ private void addToReapCount(int delta)
+ {
+ if (syncReapCount != null)
+ {
+ syncReapCount.addAndGet(delta);
+ }
+ }
+
+ private synchronized void checkReap() throws Exception
+ {
+ if (synchronousReapMessages > 0 && syncReapCount.get() >= synchronousReapMessages)
+ {
+ reapUnreferencedMessages();
+
+ syncReapCount.set(0);
+ }
+ }
+
private void reapUnreferencedMessages(final long timestamp) throws Exception
{
class ReaperRunner extends JDBCTxRunner
Modified: trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -55,6 +55,8 @@
private long reaperPeriod = 5000;
+ private int synchronousReapMessages = 0;
+
// Constructors --------------------------------------------------------
public JDBCPersistenceManagerService()
@@ -83,10 +85,21 @@
{
TransactionManager tm = getTransactionManagerReference();
+ if (reaperPeriod == 0 && synchronousReapMessages == 0)
+ {
+ throw new IllegalArgumentException("One of reaperPeriod or synchronousReapMessage must be > 0");
+ }
+
+ if (reaperPeriod > 0 && synchronousReapMessages > 0)
+ {
+ throw new IllegalArgumentException("Only one of reaperPeriod or synchronousReapMessage can be > 0");
+ }
+
persistenceManager =
new JDBCPersistenceManager(ds, tm, sqlProperties,
createTablesOnStartup, usingBatchUpdates,
- usingBinaryStream, usingTrailingByte, maxParams, reaperPeriod);
+ usingBinaryStream, usingTrailingByte, maxParams, reaperPeriod,
+ synchronousReapMessages);
persistenceManager.start();
@@ -165,9 +178,9 @@
public void setReaperPeriod(long reaperPeriod)
{
- if (reaperPeriod <= 0)
+ if (reaperPeriod < 0)
{
- throw new IllegalArgumentException("reaperPeriod must be >= 0");
+ throw new IllegalArgumentException("reaperPeriod must be > 0");
}
this.reaperPeriod = reaperPeriod;
@@ -177,4 +190,19 @@
{
return reaperPeriod;
}
+
+ public void setSynchronousReapMessages(int msgs)
+ {
+ if (msgs < 0)
+ {
+ throw new IllegalArgumentException("synchronousReapMessages must be > 0");
+ }
+
+ this.synchronousReapMessages = msgs;
+ }
+
+ public int getSynchronousReapMessages()
+ {
+ return synchronousReapMessages;
+ }
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -68,7 +68,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000);
+ true, true, true, false, 100, 5000, 0);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -99,7 +99,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, useBinaryStream, trailingByte, maxParams, 5000);
+ true, batch, useBinaryStream, trailingByte, maxParams, 5000, 0);
((JDBCPersistenceManager)p).injectNodeID(1);
p.start();
return p;
Modified: trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -108,7 +108,7 @@
pm = new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000);
+ true, true, true, false, 100, 5000, 0);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -245,7 +245,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000);
+ true, true, true, false, 100, 5000, 0);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -93,7 +93,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000);
+ true, true, true, false, 100, 5000, 0);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -87,7 +87,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000);
+ true, true, true, false, 100, 5000, 0);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -112,7 +112,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000);
+ true, true, true, false, 100, 5000, 0);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -204,7 +204,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000);
+ true, true, true, false, 100, 5000, 0);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-10-19 10:39:50 UTC (rev 3201)
+++ trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-10-19 11:36:27 UTC (rev 3202)
@@ -73,7 +73,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, true, false, maxParams, 5000);
+ true, batch, true, false, maxParams, 5000, 0);
((JDBCPersistenceManager)pm).injectNodeID(1);
p.start();
return p;
More information about the jboss-cvs-commits
mailing list