[jboss-cvs] jboss-jms/tests/src/org/jboss/test/messaging/jms/stress ...
Timothy Fox
tim.fox at jboss.com
Mon Jul 17 13:15:03 EDT 2006
User: timfox
Date: 06/07/17 13:15:03
Modified: tests/src/org/jboss/test/messaging/jms/stress
Receiver.java Sender.java StressTest.java
StressTestBase.java Transactional2PCReceiver.java
TransactionalReceiver.java
Log:
Many changes including implementation of prefetch, SEDAisation of server, changing of recovery
Revision Changes Path
1.11 +14 -1 jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Receiver.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Receiver.java 30 Jun 2006 19:03:59 -0000 1.10
+++ Receiver.java 17 Jul 2006 17:15:03 -0000 1.11
@@ -74,6 +74,8 @@
private Message theMessage;
+ private boolean finished;
+
public Receiver(Connection conn, Session sess, int numMessages, Destination dest) throws Exception
{
@@ -116,7 +118,7 @@
//Wait for message to be processed
synchronized (lock2)
{
- while (!done)
+ while (!done && !finished)
{
lock2.wait();
}
@@ -131,6 +133,15 @@
}
}
+ protected void finished()
+ {
+ synchronized (lock2)
+ {
+ finished = true;
+ lock2.notify();
+ }
+ }
+
protected Message getMessage() throws Exception
@@ -204,6 +215,8 @@
prodName = m.getStringProperty("PROD_NAME");
msgCount = new Integer(m.getIntProperty("MSG_NUMBER"));
+ //
+ // log.info(this + " Got: " + prodName + ":" + msgCount);
Integer prevCount = (Integer)counts.get(prodName);
if (prevCount == null)
1.6 +1 -0 jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/Sender.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Sender.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/Sender.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Sender.java 24 Apr 2006 13:14:31 -0000 1.5
+++ Sender.java 17 Jul 2006 17:15:03 -0000 1.6
@@ -64,6 +64,7 @@
Message m = sess.createMessage();
m.setStringProperty("PROD_NAME", prodName);
m.setIntProperty("MSG_NUMBER", count);
+ // log.info("sent: " + prodName + ":" + count);
prod.send(m);
count++;
}
1.3 +26 -25 jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/StressTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StressTest.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/StressTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- StressTest.java 18 May 2006 01:51:15 -0000 1.2
+++ StressTest.java 17 Jul 2006 17:15:03 -0000 1.3
@@ -276,49 +276,50 @@
MessageConsumer cons20 = rsess20.createDurableSubscriber(topic1, "sub10");
- //To make sure paging occurs first send the messages, then receive
+ //To make sure paging occurs first send some messages before receiving
Runner[] runners = new Runner[] {
- new Sender("prod1", sess1, prod1, NUM_NON_PERSISTENT_MESSAGES),
- new Sender("prod2", sess2, prod2, NUM_PERSISTENT_MESSAGES)
+ new Sender("prod1", sess1, prod1, NUM_NON_PERSISTENT_PRESEND),
+ new Sender("prod2", sess2, prod2, NUM_PERSISTENT_PRESEND)
};
runRunners(runners);
runners = new Runner[] {
//4 auto ack
- new Receiver(rsess1, cons1, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, false),
- new Receiver(rsess2, cons2, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, true),
- new Receiver(rsess3, cons3, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, false),
- new Receiver(rsess4, cons4, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, true),
+ new Receiver(rsess1, cons1, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, false),
+ new Receiver(rsess2, cons2, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, true),
+ new Receiver(rsess3, cons3, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, false),
+ new Receiver(rsess4, cons4, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, true),
//4 dups ok
- new Receiver(rsess5, cons5, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, false),
- new Receiver(rsess6, cons6, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, true),
- new Receiver(rsess7, cons7, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, false),
- new Receiver(rsess8, cons8, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, true),
+ new Receiver(rsess5, cons5, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, false),
+ new Receiver(rsess6, cons6, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, true),
+ new Receiver(rsess7, cons7, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, false),
+ new Receiver(rsess8, cons8, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, true),
//4 client ack
-
- new RecoveringReceiver(rsess9, cons9, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 1, 1, false),
- new RecoveringReceiver(rsess10, cons10, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 10, 7, true),
- new RecoveringReceiver(rsess11, cons11, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 50, 21, false),
- new RecoveringReceiver(rsess12, cons12, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 100, 67, true),
+ new RecoveringReceiver(rsess9, cons9, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 1, 1, false),
+ new RecoveringReceiver(rsess10, cons10, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 10, 7, true),
+ new RecoveringReceiver(rsess11, cons11, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 50, 21, false),
+ new RecoveringReceiver(rsess12, cons12, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 100, 67, true),
//4 transactional
- new TransactionalReceiver(rsess13, cons13, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 1, 1, false),
- new TransactionalReceiver(rsess14, cons14, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 10, 7, true),
- new TransactionalReceiver(rsess15, cons15, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 50, 21, false),
- new TransactionalReceiver(rsess16, cons16, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 100, 67, true),
+ new TransactionalReceiver(rsess13, cons13, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 1, 1, false),
+ new TransactionalReceiver(rsess14, cons14, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 10, 7, true),
+ new TransactionalReceiver(rsess15, cons15, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 50, 21, false),
+ new TransactionalReceiver(rsess16, cons16, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 100, 67, true),
//4 2pc transactional
- new Transactional2PCReceiver(rxaSess1, cons17, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 1, 1, false),
- new Transactional2PCReceiver(rxaSess2, cons18, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 10, 7, true),
- new Transactional2PCReceiver(rxaSess3, cons19, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 50, 21, false),
- new Transactional2PCReceiver(rxaSess4, cons20, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES, 100, 67, true),
+ new Transactional2PCReceiver(rxaSess1, cons17, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 1, 1, false),
+ new Transactional2PCReceiver(rxaSess2, cons18, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 10, 7, true),
+ new Transactional2PCReceiver(rxaSess3, cons19, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 50, 21, false),
+ new Transactional2PCReceiver(rxaSess4, cons20, NUM_NON_PERSISTENT_MESSAGES + NUM_PERSISTENT_MESSAGES + NUM_NON_PERSISTENT_PRESEND + NUM_PERSISTENT_PRESEND, 100, 67, true),
+ new Sender("prod3", sess1, prod1, NUM_NON_PERSISTENT_MESSAGES),
+ new Sender("prod4", sess2, prod2, NUM_PERSISTENT_MESSAGES)
};
runRunners(runners);
1.13 +7 -3 jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StressTestBase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- StressTestBase.java 2 May 2006 17:53:28 -0000 1.12
+++ StressTestBase.java 17 Jul 2006 17:15:03 -0000 1.13
@@ -45,6 +45,10 @@
protected static final int NUM_NON_PERSISTENT_MESSAGES = 6000;
+ protected static final int NUM_PERSISTENT_PRESEND = 2000;
+
+ protected static final int NUM_NON_PERSISTENT_PRESEND = 3000;
+
protected ConnectionFactory cf;
protected Destination topic;
@@ -72,11 +76,11 @@
//We test with small values for paging params to really stress it
- final int fullSize = 3000;
+ final int fullSize = 1000;
- final int pageSize = 1000;
+ final int pageSize = 100;
- final int downCacheSize = 1000;
+ final int downCacheSize = 100;
ServerManagement.deployQueue("Queue1", fullSize, pageSize, downCacheSize);
ServerManagement.deployQueue("Queue2", fullSize, pageSize, downCacheSize);
1.6 +2 -0 jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Transactional2PCReceiver.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Transactional2PCReceiver.java 28 Jun 2006 09:21:51 -0000 1.5
+++ Transactional2PCReceiver.java 17 Jul 2006 17:15:03 -0000 1.6
@@ -216,6 +216,8 @@
xaResource.prepare(xid);
xaResource.commit(xid, false);
+ finished();
+
}
catch (Exception e)
{
1.7 +6 -3 jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/TransactionalReceiver.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TransactionalReceiver.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/tests/src/org/jboss/test/messaging/jms/stress/TransactionalReceiver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- TransactionalReceiver.java 28 Jun 2006 09:21:51 -0000 1.6
+++ TransactionalReceiver.java 17 Jul 2006 17:15:03 -0000 1.7
@@ -182,13 +182,16 @@
}
count.lastReceived = msgCount.intValue();
- if (innerCount == rollbackSize -1)
+ if ((innerCount == rollbackSize -1) && (outerCount != iterations - 1))
{
+ //Don't roll back on the very last one
sess.rollback();
}
processingDone();
}
}
+ log.info(this + " done");
+ finished();
}
catch (Exception e)
{
More information about the jboss-cvs-commits
mailing list