[jboss-cvs] JBoss Messaging SVN: r3263 - in trunk: src/etc/server/default/deploy and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 30 21:23:05 EDT 2007
Author: timfox
Date: 2007-10-30 21:23:04 -0400 (Tue, 30 Oct 2007)
New Revision: 3263
Modified:
trunk/docs/userguide/en/modules/configuration.xml
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/jms/client/container/ConsumerAspect.java
trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
trunk/src/main/org/jboss/jms/client/state/SessionState.java
trunk/src/main/org/jboss/messaging/core/contract/PersistenceManager.java
trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
trunk/src/main/org/jboss/messaging/core/impl/JDBCSupport.java
trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.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/ChannelShare_NP_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.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_NP_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
trunk/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
trunk/tests/src/org/jboss/test/messaging/jms/MessageCleanupTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredClientCrashTest.java
trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/QueueStressTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/SeveralClientsStressTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/TopicStressTest.java
trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
trunk/tests/src/org/jboss/test/messaging/tools/container/Server.java
Log:
Removed reaper and workaround for mysql bug
Modified: trunk/docs/userguide/en/modules/configuration.xml
===================================================================
--- trunk/docs/userguide/en/modules/configuration.xml 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/docs/userguide/en/modules/configuration.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -892,10 +892,7 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
-
- <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
-
- <attribute name="ReaperPeriod">0</attribute>
+
</mbean>
</programlisting>
@@ -954,16 +951,6 @@
<literal>SupportsBlobOnSelect</literal> attribute is set to
<literal>true</literal></para>
</section>
- <section id="conf.persistencemanager.attributes.reaperperiod">
- <title>ReaperPeriod</title>
- <para>This value determines how often the database message reaper
- removes unreferenced (deleted) messages in milliseconds. If it's
- value is 0 (zero) then a reaper is not used and messages are
- deleted synchronously on acknowledgement.</para>
- <para>By default the value of <literal>ReaperPeriod</literal>
- attribute is set to <literal>0</literal> which means synchronous
- removal of messages is used.</para>
- </section>
<section id="conf.persistencemanager.attributes.sqlproperties">
<title>SQLProperties</title>
<para>This is where the DDL and DML for the particular database is
Modified: trunk/src/etc/server/default/deploy/db2-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -84,10 +84,6 @@
<attribute name="MaxParams">500</attribute>
- <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
-
- <attribute name="ReaperPeriod">0</attribute>
-
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -86,10 +86,7 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
-
- <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
-
- <attribute name="ReaperPeriod">0</attribute>
+
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -86,10 +86,7 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
-
- <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
-
- <attribute name="ReaperPeriod">0</attribute>
+
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/etc/server/default/deploy/mysqlcluster-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -87,10 +87,6 @@
<attribute name="MaxParams">500</attribute>
- <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
-
- <attribute name="ReaperPeriod">0</attribute>
-
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -90,10 +90,7 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
-
- <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
-
- <attribute name="ReaperPeriod">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-30 09:09:55 UTC (rev 3262)
+++ trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -87,10 +87,6 @@
<attribute name="MaxParams">500</attribute>
- <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
-
- <attribute name="ReaperPeriod">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-30 09:09:55 UTC (rev 3262)
+++ trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -92,10 +92,6 @@
<attribute name="MaxParams">500</attribute>
- <!-- The period between asynchronous reaps of unreferenced messages, or zero for synchronous reaping -->
-
- <attribute name="ReaperPeriod">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-30 09:09:55 UTC (rev 3262)
+++ trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml 2007-10-31 01:23:04 UTC (rev 3263)
@@ -65,12 +65,6 @@
<type>int</type>
</attribute>
- <attribute access="read-write" getMethod="getReaperPeriod" setMethod="setReaperPeriod">
- <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 access="read-write" getMethod="isSupportsBlobOnSelect" setMethod="setSupportsBlobOnSelect">
<description>Some databases don't support binding blobs on select clauses</description>
<name>SupportsBlobOnSelect</name>
Modified: trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -21,7 +21,8 @@
*/
package org.jboss.jms.client.container;
-import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+import javax.jms.MessageListener;
+
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.jms.client.delegate.DelegateSupport;
@@ -36,7 +37,7 @@
import org.jboss.logging.Logger;
import org.jboss.messaging.util.MessageQueueNameHelper;
-import javax.jms.MessageListener;
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
/**
*
Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -914,6 +914,15 @@
* However when the Session is being used by ASF we should consider the case where
* we will convert LocalTX to GlobalTransactions.
* This function helper will ensure the condition that needs to be tested on this aspect
+ *
+ * There is a real conundrum here:
+ *
+ * An XA Session needs to act as transacted when not enlisted for consuming messages for an MDB so when it does
+ * get enlisted we can transfer the work inside the tx
+ *
+ * But in needs to act as auto_acknowledge when not enlisted and not in an MDB (or bridge or stress test) to satisfy
+ * integration tests and TCK!!! Hence getTreatAsNonTransactedWhenNotEnlisted()
+ *
* */
private boolean isXAAndConsideredNonTransacted(SessionState state)
{
Modified: trunk/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/SessionState.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/main/org/jboss/jms/client/state/SessionState.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -394,7 +394,8 @@
{
if (info != null && autoAckInfo != null)
{
- throw new IllegalStateException("There is already a delivery set for auto ack");
+ throw new IllegalStateException("There is already a delivery set for auto ack " + System.identityHashCode(this) +
+ " xa: " + this.xa);
}
autoAckInfo = info;
}
Modified: trunk/src/main/org/jboss/messaging/core/contract/PersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/PersistenceManager.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/main/org/jboss/messaging/core/contract/PersistenceManager.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -39,13 +39,6 @@
*/
public interface PersistenceManager extends MessagingComponent
{
- void startReaper();
-
- void stopReaper();
-
- void reapUnreferencedMessages() throws Exception;
-
-
void addReference(long channelID, MessageReference ref, Transaction tx) throws Exception;
void removeReference(long channelID, MessageReference ref, Transaction tx) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -34,6 +34,8 @@
import java.sql.Statement;
import java.sql.Types;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -42,8 +44,6 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
@@ -97,14 +97,6 @@
private boolean nodeIDSet;
- private Timer reaperTimer;
-
- private Reaper reaper;
-
- private long reaperPeriod;
-
- private boolean reaperRunning;
-
// 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)
private boolean supportsBlobSelect;
@@ -114,7 +106,7 @@
public JDBCPersistenceManager(DataSource ds, TransactionManager tm, Properties sqlProperties,
boolean createTablesOnStartup, boolean usingBatchUpdates,
boolean usingBinaryStream, boolean usingTrailingByte, int maxParams,
- long reaperPeriod, boolean supportsBlobSelect)
+ boolean supportsBlobSelect)
{
super(ds, tm, sqlProperties, createTablesOnStartup);
@@ -125,16 +117,7 @@
this.usingTrailingByte = usingTrailingByte;
this.maxParams = maxParams;
-
- this.reaperPeriod = reaperPeriod;
-
- if (reaperPeriod > 0)
- {
- reaperTimer = new Timer(true);
-
- reaper = new Reaper();
- }
-
+
this.supportsBlobSelect = supportsBlobSelect;
}
@@ -167,7 +150,7 @@
" Using an isolation level more strict than READ_COMMITTED may lead to deadlock.\n";
log.warn(warn);
}
-
+
log.debug("Adding record on JBM_DUAL");
//Now we need to insert a row in the DUAL table if it doesn't contain one already
@@ -235,18 +218,6 @@
log.debug(this + " started");
}
- public void stop() throws Exception
- {
- super.stop();
-
- if (reaper != null)
- {
- reaperTimer.cancel();
-
- stopReaper();
- }
- }
-
// Injection -------------------------------------------------
// This is only known by server peer so we inject it after startup
@@ -259,42 +230,7 @@
}
// PersistenceManager implementation -------------------------
-
- public synchronized void startReaper()
- {
- if (reaperRunning)
- {
- return;
- }
-
- if (reaper != null && reaperPeriod != -1)
- {
- reaperTimer.schedule(reaper, reaperPeriod, reaperPeriod);
-
- reaperRunning = true;
- }
- }
-
- public synchronized void stopReaper()
- {
- if (!reaperRunning)
- {
- return;
- }
-
- if (reaper != null)
- {
- reaper.cancel();
-
- reaperRunning = false;
- }
- }
-
- public void reapUnreferencedMessages() throws Exception
- {
- reapUnreferencedMessages(System.currentTimeMillis());
- }
-
+
// Related to XA Recovery
// ======================
@@ -387,7 +323,7 @@
throw new IllegalArgumentException("block size must be > 0");
}
- class ReserveIDBlockRunner extends JDBCTxRunner<Long>
+ class ReserveIDBlockRunner extends JDBCTxRunner2<Long>
{
public Long doTransaction() throws Exception
{
@@ -473,7 +409,7 @@
{
if (trace) { log.trace("Getting batch of messages for " + messageIds); }
- class GetMessageListTX extends JDBCTxRunner<List>
+ class GetMessageListTX extends JDBCTxRunner2<List>
{
public List<Message> doTransaction() throws Exception
@@ -600,7 +536,7 @@
{
if (trace) { log.trace("Paging references in channel " + channelID + " refs " + references.size()); }
- class PageReferencesRunner extends JDBCTxRunner
+ class PageReferencesRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -671,23 +607,16 @@
{
if (trace) { log.trace(this + " Removing depaged " + references.size() + " refs from channel " + channelID); }
- class RemoveDepagedReferencesRunner extends JDBCTxRunner
+ class RemoveDepagedReferencesRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
PreparedStatement psDeleteReference = null;
- PreparedStatement psDeleteMessage = null;
-
try
{
psDeleteReference = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE_REF"));
- if (reaper == null)
- {
- psDeleteMessage = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE"));
- }
-
Iterator iter = references.iterator();
while (iter.hasNext())
@@ -700,15 +629,6 @@
if (trace) { log.trace("Deleted " + rows + " references"); }
- if (reaper == null)
- {
- psDeleteMessage.setLong(1, ref.getMessage().getMessageID());
- psDeleteMessage.setLong(2, ref.getMessage().getMessageID());
-
- rows = psDeleteMessage.executeUpdate();
-
- if (trace) { log.trace("Deleted " + rows + " messages"); }
- }
}
return null;
@@ -716,20 +636,21 @@
finally
{
closeStatement(psDeleteReference);
- closeStatement(psDeleteMessage);
}
}
}
+
+ new RemoveDepagedReferencesRunner().executeWithRetry();
- new RemoveDepagedReferencesRunner().executeWithRetry();
- }
-
+ deleteMessages(references);
+ }
+
// After loading paged refs this is used to update P messages to non paged
public void updateReferencesNotPagedInRange(final long channelID, final long orderStart, final long orderEnd, final long num) throws Exception
{
if (trace) { log.trace("Updating paged references for channel " + channelID + " between " + orderStart + " and " + orderEnd); }
- class UpdateReferencesNotPagedInRangeRunner extends JDBCTxRunner
+ class UpdateReferencesNotPagedInRangeRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -772,7 +693,7 @@
{
if (trace) { log.trace("Updating page order for channel:" + channelID); }
- class UpdatePageOrderRunner extends JDBCTxRunner
+ class UpdatePageOrderRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -986,7 +907,7 @@
throw new IllegalArgumentException("Cannot merge transactions - they have the same channel id!!");
}
- class MergeTransactionsRunner extends JDBCTxRunner
+ class MergeTransactionsRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -1023,7 +944,7 @@
throw new IllegalArgumentException("Cannot merge queues - they have the same channel id!!");
}
- class MergeAndLoadRunner extends JDBCTxRunner
+ class MergeAndLoadRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -1190,7 +1111,7 @@
public void addReference(final long channelID, final MessageReference ref, final Transaction tx) throws Exception
{
- class AddReferenceRunner extends JDBCTxRunner
+ class AddReferenceRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -1252,7 +1173,7 @@
public void updateDeliveryCount(final long channelID, final MessageReference ref) throws Exception
{
- class UpdateDeliveryCountRunner extends JDBCTxRunner
+ class UpdateDeliveryCountRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -1286,23 +1207,16 @@
public void removeReference(final long channelID, final MessageReference ref, final Transaction tx) throws Exception
{
- class RemoveReferenceRunner extends JDBCTxRunner
+ class RemoveReferenceRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
PreparedStatement psReference = null;
-
- PreparedStatement psMessage = null;
-
+
try
{
- psReference = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE_REF"));
+ psReference = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE_REF"));
- if (reaper == null)
- {
- psMessage = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE"));
- }
-
//Remove the message reference
removeReference(channelID, ref, psReference);
@@ -1315,27 +1229,16 @@
}
if (trace) { log.trace("Deleted " + rows + " references"); }
-
- if (reaper == null)
- {
- psMessage.setLong(1, ref.getMessage().getMessageID());
- psMessage.setLong(2, ref.getMessage().getMessageID());
-
- rows = psMessage.executeUpdate();
-
- if (trace) { log.trace("Deleted " + rows + " messages"); }
- }
-
+
return null;
}
finally
{
closeStatement(psReference);
- closeStatement(psMessage);
}
}
}
-
+
if (tx != null)
{
//In a tx so we just add the ref in the tx in memory for now
@@ -1347,11 +1250,14 @@
else
{
//No tx so we remove the reference directly from the db
-
- new RemoveReferenceRunner().executeWithRetry();
+
+ new RemoveReferenceRunner().executeWithRetry();
+
+ deleteMessage(ref.getMessage().getMessageID());
}
}
+
public boolean referenceExists(long messageID) throws Exception
{
Connection conn = null;
@@ -1419,7 +1325,7 @@
protected void handleBeforeCommit1PC(final List refsToAdd, final List refsToRemove, final Transaction tx)
throws Exception
{
- class HandleBeforeCommit1PCRunner extends JDBCTxRunner
+ class HandleBeforeCommit1PCRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -1430,8 +1336,7 @@
PreparedStatement psReference = null;
PreparedStatement psInsertMessage = null;
PreparedStatement psDeleteReference = null;
- PreparedStatement psDeleteMessage = null;
-
+
List<Message> messagesStored = new ArrayList<Message>();
try
@@ -1495,20 +1400,6 @@
if (trace) { log.trace("Deleted " + rows + " references"); }
- if (reaper == null)
- {
- if (psDeleteMessage == null)
- {
- psDeleteMessage = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE"));
- }
-
- psDeleteMessage.setLong(1, pair.ref.getMessage().getMessageID());
- psDeleteMessage.setLong(2, pair.ref.getMessage().getMessageID());
-
- rows = psDeleteMessage.executeUpdate();
-
- if (trace) { log.trace("Deleted " + rows + " messages"); }
- }
}
return null;
@@ -1528,16 +1419,18 @@
closeStatement(psReference);
closeStatement(psDeleteReference);
closeStatement(psInsertMessage);
- closeStatement(psDeleteMessage);
}
}
}
- new HandleBeforeCommit1PCRunner().executeWithRetry();
+
+ new HandleBeforeCommit1PCRunner().executeWithRetry();
+
+ this.deleteMessages(refsToRemove);
}
protected void handleBeforeCommit2PC(final List refsToRemove, final Transaction tx) throws Exception
{
- class HandleBeforeCommit2PCRunner extends JDBCTxRunner
+ class HandleBeforeCommit2PCRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -1565,31 +1458,6 @@
if (trace) { log.trace(JDBCUtil.statementToString(getSQLStatement("COMMIT_MESSAGE_REF2"), new Long(tx.getId())) + " updated " + rows + " row(s)"); }
- ps.close();
- ps = null;
-
- if (reaper == null)
- {
- Iterator iter = refsToRemove.iterator();
-
- while (iter.hasNext())
- {
- ChannelRefPair pair = (ChannelRefPair)iter.next();
-
- if (ps == null)
- {
- ps = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE"));
- }
-
- ps.setLong(1, pair.ref.getMessage().getMessageID());
- ps.setLong(2, pair.ref.getMessage().getMessageID());
-
- rows = ps.executeUpdate();
-
- if (trace) { log.trace("Deleted " + rows + " messages"); }
- }
- }
-
removeTXRecord(conn, tx);
return null;
@@ -1601,12 +1469,14 @@
}
}
- new HandleBeforeCommit2PCRunner().executeWithRetry();
+ new HandleBeforeCommit2PCRunner().executeWithRetry();
+
+ this.deleteMessages(refsToRemove);
}
protected void handleBeforePrepare(final List refsToAdd, final List refsToRemove, final Transaction tx) throws Exception
{
- class HandleBeforePrepareRunner extends JDBCTxRunner
+ class HandleBeforePrepareRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -1714,7 +1584,7 @@
protected void handleBeforeRollback(final List refsToAdd, final Transaction tx) throws Exception
{
- class HandleBeforeRollbackRunner extends JDBCTxRunner
+ class HandleBeforeRollbackRunner extends JDBCTxRunner2
{
public Object doTransaction() throws Exception
{
@@ -1747,31 +1617,6 @@
+ " row(s)");
}
- ps.close();
- ps = null;
-
- if (reaper == null)
- {
- Iterator iter = refsToAdd.iterator();
-
- while (iter.hasNext())
- {
- ChannelRefPair pair = (ChannelRefPair)iter.next();
-
- if (ps == null)
- {
- ps = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE"));
- }
-
- ps.setLong(1, pair.ref.getMessage().getMessageID());
- ps.setLong(2, pair.ref.getMessage().getMessageID());
-
- rows = ps.executeUpdate();
-
- if (trace) { log.trace("Deleted " + rows + " messages"); }
- }
- }
-
removeTXRecord(conn, tx);
return null;
@@ -1783,7 +1628,9 @@
}
}
- new HandleBeforeRollbackRunner().executeWithRetry();
+ new HandleBeforeRollbackRunner().executeWithRetry();
+
+ this.deleteMessages(refsToAdd);
}
@@ -2294,6 +2141,93 @@
// Private -------------------------------------------------------
+ private void deleteMessages(final List references) throws Exception
+ {
+ class DeleteMessagesRunner extends JDBCTxRunner2
+ {
+ public Object doTransaction() throws Exception
+ {
+
+ PreparedStatement psMessage = null;
+
+ try
+ {
+ psMessage = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE"));
+
+ Iterator iter = references.iterator();
+
+ while (iter.hasNext())
+ {
+ Object obj = iter.next();
+
+ MessageReference ref;
+ if (obj instanceof MessageReference)
+ {
+ ref = (MessageReference)obj;
+ }
+ else
+ {
+ ref = ((ChannelRefPair)obj).ref;
+ }
+
+ psMessage.setLong(1, ref.getMessage().getMessageID());
+ psMessage.setLong(2, ref.getMessage().getMessageID());
+
+ int rows = psMessage.executeUpdate();
+
+ if (trace) { log.trace("Deleted " + rows + " messages"); }
+
+ }
+
+ return null;
+ }
+ finally
+ {
+ closeStatement(psMessage);
+ }
+ }
+ }
+
+ //Order to avoid deadlock
+ orderReferences(references);
+
+ new DeleteMessagesRunner().executeWithRetry();
+ }
+
+
+ private void deleteMessage(final long messageID) throws Exception
+ {
+ class DeleteMessageRunner extends JDBCTxRunner2
+ {
+ public Object doTransaction() throws Exception
+ {
+
+ PreparedStatement psMessage = null;
+
+ try
+ {
+ psMessage = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE"));
+
+ psMessage.setLong(1, messageID);
+ psMessage.setLong(2, messageID);
+
+ int rows = psMessage.executeUpdate();
+
+ if (trace) { log.trace("Deleted " + rows + " messages"); }
+
+ return null;
+ }
+ finally
+ {
+ closeStatement(psMessage);
+ }
+ }
+ }
+
+ new DeleteMessageRunner().executeWithRetry();
+ }
+
+
private List getMessageChannelPair(String sqlQuery, long transactionId) throws Exception
{
if (trace) log.trace("loading message and channel ids for tx [" + transactionId + "]");
@@ -2433,76 +2367,9 @@
return order;
}
-
- private void reapUnreferencedMessages(final long timestamp) throws Exception
- {
- class ReaperRunner extends JDBCTxRunner
- {
- public Object doTransaction() throws Exception
- {
- PreparedStatement ps = null;
-
- int rows = -1;
-
- try
- {
- ps = conn.prepareStatement(getSQLStatement("REAP_MESSAGES"));
-
- ps.setLong(1, timestamp);
-
- rows = ps.executeUpdate();
-
- return rows;
- }
- finally
- {
- closeStatement(ps);
- }
- }
- }
-
- long start = System.currentTimeMillis();
-
- int rows = (Integer)new ReaperRunner().executeWithRetry();
-
- long end = System.currentTimeMillis();
-
- if (trace) { log.trace("Reaper reaped " + rows + " messages in " + (end - start) + " ms"); }
- }
-
+
// Inner classes -------------------------------------------------
- private class Reaper extends TimerTask
- {
- private boolean cancel;
-
- public synchronized void run()
- {
- if (cancel)
- {
- cancel();
-
- return;
- }
-
- try
- {
- reapUnreferencedMessages(System.currentTimeMillis() - reaperPeriod);
- }
- catch (Exception e)
- {
- log.error("Failed to reap", e);
- }
- }
-
- public synchronized void doCancel()
- {
- cancel = true;
-
- cancel();
- }
- }
-
private static class ChannelRefPair
{
private long channelID;
@@ -2587,4 +2454,36 @@
}
}
+ private void orderReferences(List references)
+ {
+ Collections.sort(references, MessageOrderComparator.instance);
+ }
+
+ private static class MessageOrderComparator implements Comparator
+ {
+ static MessageOrderComparator instance = new MessageOrderComparator();
+
+ public int compare(Object o1, Object o2)
+ {
+ MessageReference ref1;
+ MessageReference ref2;
+
+ if (o1 instanceof MessageReference)
+ {
+ ref1 = (MessageReference)o1;
+ ref2 = (MessageReference)o2;
+ }
+ else
+ {
+ ref1 = ((ChannelRefPair)o1).ref;
+ ref2 = ((ChannelRefPair)o2).ref;
+ }
+
+ long id1 = ref1.getMessage().getMessageID();
+ long id2 = ref2.getMessage().getMessageID();
+
+ return (id1 < id2 ? -1 : (id1 == id2 ? 0 : 1));
+ }
+ }
+
}
Modified: trunk/src/main/org/jboss/messaging/core/impl/JDBCSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/JDBCSupport.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/main/org/jboss/messaging/core/impl/JDBCSupport.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -23,8 +23,8 @@
import java.sql.Connection;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.SQLException;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -33,6 +33,7 @@
import javax.sql.DataSource;
import javax.transaction.Status;
+import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.jboss.logging.Logger;
@@ -391,8 +392,8 @@
}
finally
{
- closeConnection(conn);
- wrap.end();
+ wrap.end();
+ closeConnection(conn);
}
}
@@ -412,9 +413,9 @@
}
return res;
}
- catch (SQLException e)
+ catch (SQLException e)
{
- log.warn("SQLException caught, SQLState " + e.getSQLState() + " code:" + e.getErrorCode() + "- assuming deadlock detected, try:" + (tries + 1), e);
+ log.warn("SQLException caught, SQLState " + e.getSQLState() + " code:" + e.getErrorCode() + "- assuming deadlock detected, try:" + (tries + 1), e);
tries++;
if (tries == MAX_TRIES)
@@ -431,5 +432,88 @@
public abstract T doTransaction() throws Exception;
}
+
+
+ protected abstract class JDBCTxRunner2<T>
+ {
+ private static final int MAX_TRIES = 25;
+ protected Connection conn;
+
+ public T execute() throws Exception
+ {
+ Transaction tx = tm.suspend();
+
+ try
+ {
+ conn = ds.getConnection();
+
+ conn.setAutoCommit(false);
+
+ T res = doTransaction();
+
+ conn.commit();
+
+ return res;
+ }
+ catch (Exception e)
+ {
+ try
+ {
+ conn.rollback();
+ }
+ catch (Throwable t)
+ {
+ log.trace("Failed to rollback", t);
+ }
+
+ throw e;
+ }
+ finally
+ {
+ closeConnection(conn);
+
+ if (tx != null)
+ {
+ tm.resume(tx);
+ }
+ }
+ }
+
+ public T executeWithRetry() throws Exception
+ {
+ int tries = 0;
+
+ while (true)
+ {
+ try
+ {
+ T res = execute();
+
+ if (tries > 0)
+ {
+ log.warn("Update worked after retry");
+ }
+ return res;
+ }
+ catch (SQLException e)
+ {
+ log.warn("SQLException caught, SQLState " + e.getSQLState() + " code:" + e.getErrorCode() + "- assuming deadlock detected, try:" + (tries + 1), e);
+
+ tries++;
+ if (tries == MAX_TRIES)
+ {
+ log.error("Retried " + tries + " times, now giving up");
+ throw new IllegalStateException("Failed to excecute transaction");
+ }
+ log.warn("Trying again after a pause");
+ //Now we wait for a random amount of time to minimise risk of deadlock
+ Thread.sleep((long)(Math.random() * 500));
+ }
+ }
+ }
+
+ public abstract T doTransaction() throws Exception;
+ }
+
}
Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -367,13 +367,7 @@
put(Replicator.JVM_ID_KEY, clientVMId);
groupMember.multicastControl(new JoinClusterRequest(thisNodeID, info), true);
-
- checkStartReaper();
}
- else
- {
- pm.startReaper();
- }
//Now load the bindings for this node
@@ -892,22 +886,10 @@
log.debug(this + ": " + address + " joined");
}
- private void checkStartReaper()
- {
- if (groupMember.getCurrentView().size() == 1)
- {
- //We are the only member in the group - start the message reaper
-
- pm.startReaper();
- }
- }
-
public void nodesLeft(List addresses) throws Throwable
{
if (trace) { log.trace("Nodes left " + addresses.size()); }
- checkStartReaper();
-
Map oldFailoverMap = new HashMap(this.failoverMap);
int oldFailoverNodeID = failoverNodeID;
Modified: trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -53,8 +53,6 @@
private int maxParams = 100;
- private long reaperPeriod = 5000;
-
private boolean supportsBlobOnSelect = true;
// Constructors --------------------------------------------------------
@@ -88,7 +86,7 @@
persistenceManager =
new JDBCPersistenceManager(ds, tm, sqlProperties,
createTablesOnStartup, usingBatchUpdates,
- usingBinaryStream, usingTrailingByte, maxParams, reaperPeriod,
+ usingBinaryStream, usingTrailingByte, maxParams,
supportsBlobOnSelect);
persistenceManager.start();
@@ -166,21 +164,6 @@
usingTrailingByte = b;
}
- public void setReaperPeriod(long reaperPeriod)
- {
- if (reaperPeriod < 0)
- {
- throw new IllegalArgumentException("reaperPeriod must be >= 0");
- }
-
- this.reaperPeriod = reaperPeriod;
- }
-
- public long getReaperPeriod()
- {
- return reaperPeriod;
- }
-
public boolean isSupportsBlobOnSelect()
{
return supportsBlobOnSelect;
Modified: trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -68,7 +68,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000,
+ true, true, true, false, 100,
!sc.getDatabaseName().equals("oracle"));
((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-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -99,7 +99,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, useBinaryStream, trailingByte, maxParams, 5000, !sc.getDatabaseName().equals("oracle"));
+ true, batch, useBinaryStream, trailingByte, maxParams, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)p).injectNodeID(1);
p.start();
return p;
@@ -165,7 +165,6 @@
assertTrue(refs.contains(new Long(m1.getMessageID())));
assertTrue(refs.contains(new Long(m2.getMessageID())));
- pm.reapUnreferencedMessages();
List msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(2, msgs.size());
@@ -185,7 +184,6 @@
assertTrue(refs.contains(new Long(m1.getMessageID())));
assertTrue(refs.contains(new Long(m2.getMessageID())));
- pm.reapUnreferencedMessages();
msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(2, msgs.size());
@@ -204,7 +202,6 @@
assertEquals(1, refs.size());
assertTrue(refs.contains(new Long(m2.getMessageID())));
- pm.reapUnreferencedMessages();
msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(1, msgs.size());
@@ -221,7 +218,6 @@
assertEquals(1, refs.size());
assertTrue(refs.contains(new Long(m2.getMessageID())));
- pm.reapUnreferencedMessages();
msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(1, msgs.size());
@@ -237,7 +233,6 @@
assertNotNull(refs);
assertTrue(refs.isEmpty());
- pm.reapUnreferencedMessages();
msgs = getMessageIds();
assertNotNull(msgs);
assertTrue(msgs.isEmpty());
@@ -516,8 +511,6 @@
assertTrue(refIds.contains(new Long(ref14.getMessage().getMessageID())));
assertTrue(refIds.contains(new Long(ref15.getMessage().getMessageID())));
-
- pm.reapUnreferencedMessages();
List msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(10, msgs.size());
@@ -560,7 +553,6 @@
assertEquals(1, refIds.size());
assertTrue(refIds.contains(new Long(ref11.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
ms = getMessageIds();
assertNotNull(ms);
@@ -595,7 +587,6 @@
assertTrue(refIds.contains(new Long(ref9.getMessage().getMessageID())));
assertTrue(refIds.contains(new Long(ref10.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
ms = getMessageIds();
assertNotNull(ms);
@@ -624,7 +615,6 @@
refs.add(ref10);
pm.removeDepagedReferences(channel1.getChannelID(), refs);
- pm.reapUnreferencedMessages();
ms = getMessageIds();
assertNotNull(ms);
assertEquals(0, ms.size());
@@ -765,7 +755,6 @@
assertTrue(refIds.contains(new Long(ref9.getMessage().getMessageID())));
assertTrue(refIds.contains(new Long(ref10.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
List msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(10, msgs.size());
@@ -915,7 +904,6 @@
assertTrue(refIds.contains(new Long(ref9.getMessage().getMessageID())));
assertTrue(refIds.contains(new Long(ref10.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
List msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(10, msgs.size());
@@ -1321,7 +1309,6 @@
assertTrue(refs.contains(new Long(ref1.getMessage().getMessageID())));
assertTrue(refs.contains(new Long(ref2.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
List msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(2, msgs.size());
@@ -1346,7 +1333,6 @@
assertTrue(refs.contains(new Long(ref1.getMessage().getMessageID())));
assertTrue(refs.contains(new Long(ref2.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(2, msgs.size());
@@ -1366,7 +1352,6 @@
assertTrue(refs.contains(new Long(ref4.getMessage().getMessageID())));
assertTrue(refs.contains(new Long(ref5.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(3, msgs.size());
@@ -1423,15 +1408,13 @@
assertTrue(refs.contains(new Long(ref1.getMessage().getMessageID())));
assertTrue(refs.contains(new Long(ref2.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
List msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(2, msgs.size());
assertTrue(msgs.contains(new Long(ref1.getMessage().getMessageID())));
assertTrue(msgs.contains(new Long(ref2.getMessage().getMessageID())));
-
-
+
//Add the next 3 refs transactionally
pm.addReference(channel.getChannelID(), ref3, tx);
pm.addReference(channel.getChannelID(), ref4, tx);
@@ -1448,7 +1431,6 @@
assertTrue(refs.contains(new Long(ref1.getMessage().getMessageID())));
assertTrue(refs.contains(new Long(ref2.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(2, msgs.size());
@@ -1464,7 +1446,6 @@
assertTrue(refs.contains(new Long(ref1.getMessage().getMessageID())));
assertTrue(refs.contains(new Long(ref2.getMessage().getMessageID())));
- pm.reapUnreferencedMessages();
msgs = getMessageIds();
assertNotNull(msgs);
assertEquals(2, msgs.size());
Modified: trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -108,7 +108,7 @@
pm = new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
((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-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -243,7 +243,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -270,8 +270,6 @@
try
{
- pm.reapUnreferencedMessages();
-
if (this.checkNoMessageData())
{
fail("Message data still exists");
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -118,7 +118,6 @@
//Msgs
- pm.reapUnreferencedMessages();
List msgIds = getMessageIds();
assertEquals(0, msgIds.size());
@@ -168,7 +167,6 @@
//Msgs
- pm.reapUnreferencedMessages();
msgIds = getMessageIds();
assertEquals(25, msgIds.size());
@@ -217,7 +215,6 @@
//Msgs
- pm.reapUnreferencedMessages();
msgIds = getMessageIds();
assertEquals(50, msgIds.size());
@@ -266,7 +263,6 @@
//Msgs
- pm.reapUnreferencedMessages();
msgIds = getMessageIds();
assertEquals(100, msgIds.size());
@@ -309,7 +305,6 @@
//Msgs
- pm.reapUnreferencedMessages();
msgIds = getMessageIds();
assertEquals(0, msgIds.size());
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -114,7 +114,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
List msgIds = getMessageIds();
assertEquals(0, msgIds.size());
@@ -161,7 +161,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(25, msgIds.size());
@@ -208,7 +208,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(50, msgIds.size());
@@ -256,7 +256,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(100, msgIds.size());
@@ -299,7 +299,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(0, msgIds.size());
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -117,7 +117,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
List msgIds = getMessageIds();
assertEquals(0, msgIds.size());
@@ -166,7 +166,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(25, msgIds.size());
@@ -215,7 +215,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(50, msgIds.size());
@@ -264,7 +264,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(100, msgIds.size());
@@ -307,7 +307,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(0, msgIds.size());
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -118,7 +118,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
List msgIds = getMessageIds();
assertEquals(50, msgIds.size());
@@ -173,7 +173,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(75, msgIds.size());
@@ -229,7 +229,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(100, msgIds.size());
@@ -285,7 +285,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(150, msgIds.size());
@@ -328,7 +328,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(0, msgIds.size());
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -120,7 +120,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
List msgIds = getMessageIds();
assertEquals(50, msgIds.size());
@@ -173,7 +173,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(75, msgIds.size());
@@ -228,7 +228,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(100, msgIds.size());
@@ -282,7 +282,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(150, msgIds.size());
@@ -325,7 +325,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(0, msgIds.size());
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -121,7 +121,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
List msgIds = getMessageIds();
assertEquals(50, msgIds.size());
@@ -175,7 +175,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(75, msgIds.size());
@@ -231,7 +231,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(100, msgIds.size());
@@ -286,7 +286,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(150, msgIds.size());
@@ -329,7 +329,7 @@
//Msgs
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(0, msgIds.size());
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-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -93,7 +93,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -112,7 +112,7 @@
public void tearDown() throws Exception
{
- pm.reapUnreferencedMessages();
+ ;
if (checkNoMessageData())
{
fail("Message data still exists");
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-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -87,7 +87,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -90,7 +90,7 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages(); List msgIds = getMessageIds();
+ ; List msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 99 refs in queue
@@ -123,8 +123,8 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages();
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ;
+ ; msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 100 refs in queue
@@ -158,7 +158,7 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages(); pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; ; msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 100 refs in queue
@@ -192,7 +192,7 @@
assertSameIds(refIds, refs, 100, 109);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages(); pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; ; msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 100, 109);
@@ -226,7 +226,7 @@
assertSameIds(refIds, refs, 100, 109);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 100, 109);
@@ -263,7 +263,7 @@
assertSameIds(refIds, refs, 100, 119);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 100, 119);
@@ -310,7 +310,7 @@
assertSameIds(refIds, refs, 100, 129);
//Verify 30 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(30, msgIds.size());
assertSameIds(msgIds, refs, 100, 129);
@@ -348,7 +348,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -383,7 +383,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -414,7 +414,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -448,7 +448,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -479,7 +479,7 @@
assertSameIds(refIds, refs, 120, 140);
//Verify 21 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(21, msgIds.size());
assertSameIds(msgIds, refs, 120, 140);
@@ -510,7 +510,7 @@
assertSameIds(refIds, refs, 140, 140);
//Verify 1 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(1, msgIds.size());
assertSameIds(msgIds, refs, 140, 140);
@@ -540,7 +540,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 81 refs in queue
@@ -569,7 +569,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 80 refs in queue
@@ -598,7 +598,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 20 refs in queue
@@ -632,7 +632,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 40 refs in queue
@@ -667,7 +667,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 60 refs in queue
@@ -710,7 +710,7 @@
assertSameIds(refIds, refs, 221, 240);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 221, 240);
@@ -743,7 +743,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 100 refs in queue
@@ -772,7 +772,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 100 refs in queue
@@ -800,7 +800,7 @@
assertSameIds(refIds, refs, 231, 240);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages();
+ ;
msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 231, 240);
@@ -832,7 +832,7 @@
assertSameIds(refIds, refs, 221, 240);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 221, 240);
@@ -859,7 +859,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 70 refs in queue
@@ -883,7 +883,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 0 refs in queue
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -84,7 +84,7 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages(); List msgIds = getMessageIds();
+ ; List msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 99 refs in queue
@@ -112,7 +112,7 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 100 refs in queue
@@ -142,7 +142,7 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 100 refs in queue
@@ -173,7 +173,7 @@
assertSameIds(refIds, refs, 100, 109);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 100, 109);
@@ -204,7 +204,7 @@
assertSameIds(refIds, refs, 100, 109);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 100, 109);
@@ -238,7 +238,7 @@
assertSameIds(refIds, refs, 100, 119);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 100, 119);
@@ -273,7 +273,7 @@
assertSameIds(refIds, refs, 100, 129);
//Verify 30 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(30, msgIds.size());
assertSameIds(msgIds, refs, 100, 129);
@@ -308,7 +308,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -340,7 +340,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -371,7 +371,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -405,7 +405,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -439,7 +439,7 @@
assertSameIds(refIds, refs, 120, 140);
//Verify 21 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(21, msgIds.size());
assertSameIds(msgIds, refs, 120, 140);
@@ -470,7 +470,7 @@
assertSameIds(refIds, refs, 140, 140);
//Verify 1 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(1, msgIds.size());
assertSameIds(msgIds, refs, 140, 140);
@@ -500,7 +500,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 81 refs in queue
@@ -529,7 +529,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 80 refs in queue
@@ -558,7 +558,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 20 refs in queue
@@ -589,7 +589,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 40 refs in queue
@@ -621,7 +621,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 60 refs in queue
@@ -653,7 +653,7 @@
assertSameIds(refIds, refs, 221, 240);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 221, 240);
@@ -677,7 +677,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 100 refs in queue
@@ -706,7 +706,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 100 refs in queue
@@ -736,7 +736,7 @@
assertSameIds(refIds, refs, 231, 240);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 231, 240);
@@ -767,7 +767,7 @@
assertSameIds(refIds, refs, 221, 240);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 221, 240);
@@ -797,7 +797,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 0 deliveries
@@ -824,7 +824,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 0 refs in queue
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -89,7 +89,7 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages(); List msgIds = getMessageIds();
+ ; List msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 99 refs in queue
@@ -121,7 +121,7 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 100 refs in queue
@@ -154,7 +154,7 @@
assertTrue(refIds.isEmpty());
//Verify no msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertTrue(msgIds.isEmpty());
//Verify 100 refs in queue
@@ -187,7 +187,7 @@
assertSameIds(refIds, refs, 100, 109);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 100, 109);
@@ -220,7 +220,7 @@
assertSameIds(refIds, refs, 100, 109);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 100, 109);
@@ -256,7 +256,7 @@
assertSameIds(refIds, refs, 100, 119);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 100, 119);
@@ -302,7 +302,7 @@
assertSameIds(refIds, refs, 100, 129);
//Verify 30 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(30, msgIds.size());
assertSameIds(msgIds, refs, 100, 129);
@@ -337,7 +337,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -371,7 +371,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -402,7 +402,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -436,7 +436,7 @@
assertSameIds(refIds, refs, 100, 139);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 100, 139);
@@ -469,7 +469,7 @@
assertSameIds(refIds, refs, 120, 140);
//Verify 21 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(21, msgIds.size());
assertSameIds(msgIds, refs, 120, 140);
@@ -500,7 +500,7 @@
assertSameIds(refIds, refs, 140, 140);
//Verify 1 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(1, msgIds.size());
assertSameIds(msgIds, refs, 140, 140);
@@ -530,7 +530,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 81 refs in queue
@@ -559,7 +559,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 80 refs in queue
@@ -588,7 +588,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 20 refs in queue
@@ -621,7 +621,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 40 refs in queue
@@ -655,7 +655,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 60 refs in queue
@@ -689,7 +689,7 @@
assertSameIds(refIds, refs, 221, 240);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 221, 240);
@@ -721,7 +721,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 100 refs in queue
@@ -750,7 +750,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 100 refs in queue
@@ -780,7 +780,7 @@
assertSameIds(refIds, refs, 231, 240);
//Verify 10 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(10, msgIds.size());
assertSameIds(msgIds, refs, 231, 240);
@@ -811,7 +811,7 @@
assertSameIds(refIds, refs, 221, 240);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 221, 240);
@@ -838,7 +838,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 70 refs in queue
@@ -862,7 +862,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 0 refs in queue
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -93,7 +93,7 @@
assertSameIds(refIds, refs, 0, 98);
//Verify 99 msgs in storage
- pm.reapUnreferencedMessages(); List msgIds = getMessageIds();
+ ; List msgIds = getMessageIds();
assertEquals(99, msgIds.size());
assertSameIds(msgIds, refs, 0, 98);
@@ -130,7 +130,7 @@
assertSameIds(refIds, refs, 0, 99);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(100, msgIds.size());
assertSameIds(msgIds, refs, 0, 99);
@@ -170,7 +170,7 @@
assertSameIds(refIds, refs, 0, 108);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(109, msgIds.size());
assertSameIds(msgIds, refs, 0, 108);
@@ -210,7 +210,7 @@
assertSameIds(refIds, refs, 0, 109);
//Verify 110 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(110, msgIds.size());
assertSameIds(msgIds, refs, 0, 109);
@@ -248,7 +248,7 @@
assertSameIds(refIds, refs, 0, 110);
//Verify 111 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(111, msgIds.size());
assertSameIds(msgIds, refs, 0, 110);
@@ -289,7 +289,7 @@
assertSameIds(refIds, refs, 0, 119);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 0, 119);
@@ -340,7 +340,7 @@
assertSameIds(refIds, refs, 0, 129);
//Verify 130 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(130, msgIds.size());
assertSameIds(msgIds, refs, 0, 129);
@@ -382,7 +382,7 @@
assertSameIds(refIds, refs, 0, 139);
//Verify 140 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(140, msgIds.size());
assertSameIds(msgIds, refs, 0, 139);
@@ -422,7 +422,7 @@
assertSameIds(refIds, refs, 0, 140);
//Verify 141 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(141, msgIds.size());
assertSameIds(msgIds, refs, 0, 140);
@@ -457,7 +457,7 @@
assertSameIds(refIds, refs, 1, 140);
//Verify 140 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(140, msgIds.size());
assertSameIds(msgIds, refs, 1, 140);
@@ -496,7 +496,7 @@
assertSameIds(refIds, refs, 19, 140);
//Verify 122 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(122, msgIds.size());
assertSameIds(msgIds, refs, 19, 140);
@@ -534,7 +534,7 @@
assertSameIds(refIds, refs, 20, 140);
//Verify 121 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(121, msgIds.size());
assertSameIds(msgIds, refs, 20, 140);
@@ -570,7 +570,7 @@
assertSameIds(refIds, refs, 40, 140);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(101, msgIds.size());
assertSameIds(msgIds, refs, 40, 140);
@@ -605,7 +605,7 @@
assertSameIds(refIds, refs, 41, 140);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(100, msgIds.size());
assertSameIds(msgIds, refs, 41, 140);
@@ -640,7 +640,7 @@
assertSameIds(refIds, refs, 61, 140);
//Verify 80 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(80, msgIds.size());
assertSameIds(msgIds, refs, 61, 140);
@@ -675,7 +675,7 @@
assertSameIds(refIds, refs, 121, 140);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 121, 140);
@@ -713,7 +713,7 @@
assertSameIds(refIds, refs, 121, 160);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 121, 160);
@@ -752,7 +752,7 @@
assertSameIds(refIds, refs, 121, 180);
//Verify 60 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(60, msgIds.size());
assertSameIds(msgIds, refs, 121, 180);
@@ -793,7 +793,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -830,7 +830,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -865,7 +865,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -901,7 +901,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -937,7 +937,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -971,7 +971,7 @@
assertSameIds(refIds, refs, 171, 240);
//Verify 70 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(70, msgIds.size());
assertSameIds(msgIds, refs, 171, 240);
@@ -1001,7 +1001,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 0 refs in queue
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -89,7 +89,7 @@
assertSameIds(refIds, refs, 0, 98);
//Verify 99 msgs in storage
- pm.reapUnreferencedMessages(); List msgIds = getMessageIds();
+ ; List msgIds = getMessageIds();
assertEquals(99, msgIds.size());
assertSameIds(msgIds, refs, 0, 98);
@@ -123,7 +123,7 @@
assertSameIds(refIds, refs, 0, 99);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(100, msgIds.size());
assertSameIds(msgIds, refs, 0, 99);
@@ -160,7 +160,7 @@
assertSameIds(refIds, refs, 0, 108);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(109, msgIds.size());
assertSameIds(msgIds, refs, 0, 108);
@@ -193,7 +193,7 @@
assertSameIds(refIds, refs, 0, 109);
//Verify 110 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(110, msgIds.size());
assertSameIds(msgIds, refs, 0, 109);
@@ -229,7 +229,7 @@
assertSameIds(refIds, refs, 0, 110);
//Verify 111 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(111, msgIds.size());
assertSameIds(msgIds, refs, 0, 110);
@@ -268,7 +268,7 @@
assertSameIds(refIds, refs, 0, 119);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 0, 119);
@@ -308,7 +308,7 @@
assertSameIds(refIds, refs, 0, 129);
//Verify 130 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(130, msgIds.size());
assertSameIds(msgIds, refs, 0, 129);
@@ -349,7 +349,7 @@
assertSameIds(refIds, refs, 0, 139);
//Verify 140 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(140, msgIds.size());
assertSameIds(msgIds, refs, 0, 139);
@@ -386,7 +386,7 @@
assertSameIds(refIds, refs, 0, 140);
//Verify 141 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(141, msgIds.size());
assertSameIds(msgIds, refs, 0, 140);
@@ -422,7 +422,7 @@
assertSameIds(refIds, refs, 1, 140);
//Verify 140 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(140, msgIds.size());
assertSameIds(msgIds, refs, 1, 140);
@@ -460,7 +460,7 @@
assertSameIds(refIds, refs, 19, 140);
//Verify 122 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(122, msgIds.size());
assertSameIds(msgIds, refs, 19, 140);
@@ -498,7 +498,7 @@
assertSameIds(refIds, refs, 20, 140);
//Verify 121 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(121, msgIds.size());
assertSameIds(msgIds, refs, 20, 140);
@@ -534,7 +534,7 @@
assertSameIds(refIds, refs, 40, 140);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(101, msgIds.size());
assertSameIds(msgIds, refs, 40, 140);
@@ -569,7 +569,7 @@
assertSameIds(refIds, refs, 41, 140);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(100, msgIds.size());
assertSameIds(msgIds, refs, 41, 140);
@@ -604,7 +604,7 @@
assertSameIds(refIds, refs, 61, 140);
//Verify 80 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(80, msgIds.size());
assertSameIds(msgIds, refs, 61, 140);
@@ -638,7 +638,7 @@
assertSameIds(refIds, refs, 121, 140);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 121, 140);
@@ -673,7 +673,7 @@
assertSameIds(refIds, refs, 121, 160);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 121, 160);
@@ -709,7 +709,7 @@
assertSameIds(refIds, refs, 121, 180);
//Verify 60 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(60, msgIds.size());
assertSameIds(msgIds, refs, 121, 180);
@@ -747,7 +747,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -784,7 +784,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -819,7 +819,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -855,7 +855,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -891,7 +891,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -925,7 +925,7 @@
assertSameIds(refIds, refs, 171, 240);
//Verify 70 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(70, msgIds.size());
assertSameIds(msgIds, refs, 171, 240);
@@ -955,7 +955,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 0 refs in queue
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -92,7 +92,7 @@
assertSameIds(refIds, refs, 0, 98);
//Verify 99 msgs in storage
- pm.reapUnreferencedMessages(); List msgIds = getMessageIds();
+ ; List msgIds = getMessageIds();
assertEquals(99, msgIds.size());
assertSameIds(msgIds, refs, 0, 98);
@@ -128,7 +128,7 @@
assertSameIds(refIds, refs, 0, 99);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(100, msgIds.size());
assertSameIds(msgIds, refs, 0, 99);
@@ -167,7 +167,7 @@
assertSameIds(refIds, refs, 0, 108);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(109, msgIds.size());
assertSameIds(msgIds, refs, 0, 108);
@@ -206,7 +206,7 @@
assertSameIds(refIds, refs, 0, 109);
//Verify 110 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(110, msgIds.size());
assertSameIds(msgIds, refs, 0, 109);
@@ -243,7 +243,7 @@
assertSameIds(refIds, refs, 0, 110);
//Verify 111 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(111, msgIds.size());
assertSameIds(msgIds, refs, 0, 110);
@@ -283,7 +283,7 @@
assertSameIds(refIds, refs, 0, 119);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 0, 119);
@@ -324,7 +324,7 @@
assertSameIds(refIds, refs, 0, 129);
//Verify 130 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(130, msgIds.size());
assertSameIds(msgIds, refs, 0, 129);
@@ -373,7 +373,7 @@
assertSameIds(refIds, refs, 0, 139);
//Verify 140 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(140, msgIds.size());
assertSameIds(msgIds, refs, 0, 139);
@@ -411,7 +411,7 @@
assertSameIds(refIds, refs, 0, 140);
//Verify 141 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(141, msgIds.size());
assertSameIds(msgIds, refs, 0, 140);
@@ -446,7 +446,7 @@
assertSameIds(refIds, refs, 1, 140);
//Verify 140 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(140, msgIds.size());
assertSameIds(msgIds, refs, 1, 140);
@@ -485,7 +485,7 @@
assertSameIds(refIds, refs, 19, 140);
//Verify 122 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(122, msgIds.size());
assertSameIds(msgIds, refs, 19, 140);
@@ -523,7 +523,7 @@
assertSameIds(refIds, refs, 20, 140);
//Verify 121 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(121, msgIds.size());
assertSameIds(msgIds, refs, 20, 140);
@@ -559,7 +559,7 @@
assertSameIds(refIds, refs, 40, 140);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(101, msgIds.size());
assertSameIds(msgIds, refs, 40, 140);
@@ -594,7 +594,7 @@
assertSameIds(refIds, refs, 41, 140);
//Verify 100 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(100, msgIds.size());
assertSameIds(msgIds, refs, 41, 140);
@@ -629,7 +629,7 @@
assertSameIds(refIds, refs, 61, 140);
//Verify 80 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(80, msgIds.size());
assertSameIds(msgIds, refs, 61, 140);
@@ -664,7 +664,7 @@
assertSameIds(refIds, refs, 121, 140);
//Verify 20 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(20, msgIds.size());
assertSameIds(msgIds, refs, 121, 140);
@@ -701,7 +701,7 @@
assertSameIds(refIds, refs, 121, 160);
//Verify 40 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(40, msgIds.size());
assertSameIds(msgIds, refs, 121, 160);
@@ -739,7 +739,7 @@
assertSameIds(refIds, refs, 121, 180);
//Verify 60 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(60, msgIds.size());
assertSameIds(msgIds, refs, 121, 180);
@@ -779,7 +779,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -816,7 +816,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -851,7 +851,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -887,7 +887,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -923,7 +923,7 @@
assertSameIds(refIds, refs, 121, 240);
//Verify 120 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(120, msgIds.size());
assertSameIds(msgIds, refs, 121, 240);
@@ -957,7 +957,7 @@
assertSameIds(refIds, refs, 171, 240);
//Verify 70 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(70, msgIds.size());
assertSameIds(msgIds, refs, 171, 240);
@@ -987,7 +987,7 @@
assertEquals(0, refIds.size());
//Verify 0 msgs in storage
- pm.reapUnreferencedMessages(); msgIds = getMessageIds();
+ ; msgIds = getMessageIds();
assertEquals(0, msgIds.size());
//Verify 0 refs in queue
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-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -112,7 +112,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100, 5000, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
((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, !sc.getDatabaseName().equals("oracle"));
+ true, true, true, false, 100, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -224,7 +224,7 @@
refIds = getReferenceIdsOrderedByPageOrd(queue2.getChannelID());
assertEquals(0, refIds.size());
- pm.reapUnreferencedMessages();
+ ;
List msgIds = getMessageIds();
assertEquals(0, msgIds.size());
@@ -288,7 +288,7 @@
refIds = getReferenceIdsOrderedByPageOrd(queue.getChannelID());
assertEquals(0, refIds.size());
- pm.reapUnreferencedMessages();
+ ;
List msgIds = getMessageIds();
assertEquals(0, msgIds.size());
Modified: trunk/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -109,7 +109,6 @@
if (ServerManagement.isStarted(0))
{
- ServerManagement.getServer().reapMessages();
if (checkNoMessageData())
{
fail("Message Data exists");
Modified: trunk/tests/src/org/jboss/test/messaging/jms/MessageCleanupTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MessageCleanupTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MessageCleanupTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -118,8 +118,6 @@
assertEquals(0, getReferenceIds().size());
- ServerManagement.getServer().reapMessages();
-
assertEquals(0, getMessageIds().size());
conn.close();
@@ -168,12 +166,8 @@
assertEquals(0, getReferenceIds().size());
- ServerManagement.getServer().reapMessages();
-
-
assertEquals(0, getMessageIds().size());
-
-
+
conn.close();
}
@@ -222,11 +216,7 @@
assertEquals(0, getReferenceIds().size());
- ServerManagement.getServer().reapMessages();
-
-
- assertEquals(0, getMessageIds().size());
-
+ assertEquals(0, getMessageIds().size());
}
/*
@@ -276,11 +266,7 @@
assertEquals(0, getReferenceIds().size());
- ServerManagement.getServer().reapMessages();
-
-
- assertEquals(0, getMessageIds().size());
-
+ assertEquals(0, getMessageIds().size());
}
// Public --------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredClientCrashTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredClientCrashTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -23,13 +23,16 @@
package org.jboss.test.messaging.jms.clustering;
import java.lang.ref.WeakReference;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
+
import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
import org.jboss.logging.Logger;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.test.messaging.tools.container.Command;
import org.jboss.test.messaging.tools.container.Server;
+import org.jboss.test.messaging.tools.container.ServiceContainer;
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
@@ -48,8 +51,6 @@
protected Server localServer;
- //protected Server remoteServer;
-
// Constructors --------------------------------------------------
public ClusteredClientCrashTest(String name)
@@ -76,46 +77,38 @@
* cleaned-up.
*/
public void testClientCrash() throws Exception
- {
-// Commented out until http://jira.jboss.com/jira/browse/JBMESSAGING-1099 is fixed
-
-// ServerManagement.create(2);
-// Server remoteServer = ServerManagement.getServer(2);
-//
-// // We need to make sure that any previously downloaded CF should be released
-// WeakReference ref = new WeakReference(ic[0].lookup("/ClusteredConnectionFactory"));
-// int count=0;
-// while (ref.get() != null)
-// {
-// System.gc();
-// Thread.sleep(1000);
-// if ((count++>10) && ref.get() != null)
-// {
-// fail("Thre is a leak on ClusteredConnectionFactory");
-// }
-// }
-//
-//
-// ClientClusteredConnectionFactoryDelegate cfDelegate = (ClientClusteredConnectionFactoryDelegate)cf.getDelegate();
-//
-// cfDelegate.closeCallback();
-//
-// ClusterClientCrash command = new ClusterClientCrash(cf);
-//
-// assertEquals("OK", remoteServer.executeCommand(command));
-//
-// assertEquals(new Integer(1),ServerManagement.getServer(1).executeCommand(new VerifySizeOfCFClients(cfDelegate.getUniqueName())));
-//
-// ServerManagement.kill(2);
-// Thread.sleep(30000);
-//
-// assertEquals(new Integer(0), ServerManagement.getServer(0).executeCommand(new VerifySizeOfCFClients(cfDelegate.getUniqueName())));
-// assertEquals(new Integer(0), ServerManagement.getServer(1).executeCommand(new VerifySizeOfCFClients(cfDelegate.getUniqueName())));
-//
-//
-// //localServer.setAttribute(ServiceContainer.REMOTING_OBJECT_NAME, "LeasePeriod", "2000");
-//
-// //performCrash(8000, false);
+ {
+ ServerManagement.create(2);
+ Server remoteServer = ServerManagement.getServer(2);
+
+ // We need to make sure that any previously downloaded CF should be released
+ WeakReference ref = new WeakReference(ic[0].lookup("/ClusteredConnectionFactory"));
+ int count=0;
+ while (ref.get() != null)
+ {
+ System.gc();
+ Thread.sleep(1000);
+ if ((count++>10) && ref.get() != null)
+ {
+ fail("Thre is a leak on ClusteredConnectionFactory");
+ }
+ }
+
+ ClientClusteredConnectionFactoryDelegate cfDelegate = (ClientClusteredConnectionFactoryDelegate)cf.getDelegate();
+
+ cfDelegate.closeCallback();
+
+ ClusterClientCrash command = new ClusterClientCrash(cf);
+
+ assertEquals("OK", remoteServer.executeCommand(command));
+
+ assertEquals(new Integer(1),ServerManagement.getServer(1).executeCommand(new VerifySizeOfCFClients(cfDelegate.getUniqueName())));
+
+ ServerManagement.kill(2);
+ Thread.sleep((long)(60000));
+
+ assertEquals(new Integer(0), ServerManagement.getServer(0).executeCommand(new VerifySizeOfCFClients(cfDelegate.getUniqueName())));
+ assertEquals(new Integer(0), ServerManagement.getServer(1).executeCommand(new VerifySizeOfCFClients(cfDelegate.getUniqueName())));
}
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-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -73,7 +73,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, true, false, maxParams, 5000, !sc.getDatabaseName().equals("oracle"));
+ true, batch, true, false, maxParams, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
p.start();
return p;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/QueueStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/QueueStressTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/QueueStressTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -85,13 +85,21 @@
Session sess16 = conn1.createSession(true, Session.SESSION_TRANSACTED);
XASession xaSess1 = ((XAConnection)conn1).createXASession();
+ tweakXASession(xaSess1);
XASession xaSess2 = ((XAConnection)conn1).createXASession();
+ tweakXASession(xaSess2);
XASession xaSess3 = ((XAConnection)conn1).createXASession();
+ tweakXASession(xaSess3);
XASession xaSess4 = ((XAConnection)conn1).createXASession();
+ tweakXASession(xaSess4);
XASession xaSess5 = ((XAConnection)conn1).createXASession();
+ tweakXASession(xaSess5);
XASession xaSess6 = ((XAConnection)conn1).createXASession();
+ tweakXASession(xaSess6);
XASession xaSess7 = ((XAConnection)conn1).createXASession();
+ tweakXASession(xaSess7);
XASession xaSess8 = ((XAConnection)conn1).createXASession();
+ tweakXASession(xaSess8);
Session sess17 = xaSess1.getSession();
Session sess18 = xaSess2.getSession();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -215,6 +215,8 @@
prodName = m.getStringProperty("PROD_NAME");
msgCount = new Integer(m.getIntProperty("MSG_NUMBER"));
+
+ //log.info(this + " Got message " + prodName + ":" + msgCount + "M: " + m.getJMSMessageID());
Integer prevCount = (Integer)counts.get(prodName);
if (prevCount == null)
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/SeveralClientsStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/SeveralClientsStressTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/SeveralClientsStressTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -40,8 +40,6 @@
import org.jboss.logging.Logger;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
-import org.jboss.test.messaging.tools.container.ServiceContainer;
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
@@ -227,20 +225,7 @@
if (startServer)
{
- ServiceAttributeOverrides override = new ServiceAttributeOverrides();
- override.put(ServiceContainer.REMOTING_OBJECT_NAME,
- "clientMaxPoolSize", "600");
-
- override.put(ServiceContainer.REMOTING_OBJECT_NAME,
- "pingFrequency", "1000");
-
- override.put(ServiceContainer.REMOTING_OBJECT_NAME,
- "pingWindowFactor", "120");
-
- /* override.put(ServiceContainer.REMOTING_OBJECT_NAME,
- "leasePeriod", "60000"); */
-
- ServerManagement.start(0, "all", override, true);
+ ServerManagement.start(0, "all", null, true);
ServerManagement.deployQueue("testQueue");
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -24,8 +24,12 @@
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.Topic;
+import javax.jms.XASession;
import javax.naming.InitialContext;
+import org.jboss.jms.client.JBossSession;
+import org.jboss.jms.client.delegate.DelegateSupport;
+import org.jboss.jms.client.state.SessionState;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
@@ -107,8 +111,6 @@
public void tearDown() throws Exception
{
- ServerManagement.getServer().reapMessages();
-
if (checkNoMessageData())
{
fail("Message data still exists");
@@ -152,4 +154,13 @@
}
}
}
+
+ protected void tweakXASession(XASession sess)
+ {
+ JBossSession jsess = (JBossSession)sess;
+
+ SessionState sstate = (SessionState)((DelegateSupport)jsess.getDelegate()).getState();
+
+ sstate.setTreatAsNonTransactedWhenNotEnlisted(false);
+ }
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/TopicStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/TopicStressTest.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/TopicStressTest.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -108,9 +108,13 @@
//4 2pc transactional
XASession rxaSess1 = ((XAConnection)conn2).createXASession();
+ tweakXASession(rxaSess1);
XASession rxaSess2 = ((XAConnection)conn2).createXASession();
+ tweakXASession(rxaSess2);
XASession rxaSess3 = ((XAConnection)conn2).createXASession();
+ tweakXASession(rxaSess3);
XASession rxaSess4 = ((XAConnection)conn2).createXASession();
+ tweakXASession(rxaSess4);
Session rsess17 = rxaSess1.getSession();
Session rsess18 = rxaSess2.getSession();
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -906,11 +906,6 @@
getServerPeer().resetAllSuckers();
}
- public void reapMessages() throws Exception
- {
- getServerPeer().getPersistenceManagerInstance().reapUnreferencedMessages();
- }
-
// Public ---------------------------------------------------------------------------------------
// Package protected ----------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -508,11 +508,6 @@
server.resetAllSuckers();
}
- public void reapMessages() throws Exception
- {
- server.reapMessages();
- }
-
// Public --------------------------------------------------------
// Package protected ---------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/Server.java 2007-10-30 09:09:55 UTC (rev 3262)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/Server.java 2007-10-31 01:23:04 UTC (rev 3263)
@@ -289,7 +289,5 @@
void resetAllSuckers() throws Exception;
- void reapMessages() throws Exception;
-
- void deployConnectionFactory(String objectName, String[] jndiBindings, boolean strictTck) throws Exception;
+ void deployConnectionFactory(String objectName, String[] jndiBindings, boolean strictTck) throws Exception;
}
More information about the jboss-cvs-commits
mailing list