[jboss-cvs] JBoss Messaging SVN: r2824 - in trunk: src/main/org/jboss/messaging/core/impl/postoffice and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 2 17:38:40 EDT 2007
Author: timfox
Date: 2007-07-02 17:38:39 -0400 (Mon, 02 Jul 2007)
New Revision: 2824
Modified:
trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterConnectionManagerTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/RecoveringReceiver.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/RelayStressTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/Sender.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/TransactionalReceiver.java
Log:
Small fix plus removed extraneous logging
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -598,7 +598,7 @@
// make a binding for this temporary queue
// temporary queues need to bound on ALL nodes of the cluster
- postOffice.addBinding(new Binding(cond, coreQueue, true), true);
+ postOffice.addBinding(new Binding(cond, coreQueue, true), postOffice.isClustered());
coreQueue.activate();
}
@@ -647,7 +647,7 @@
// temporary queues must be unbound on ALL nodes of the cluster
- postOffice.removeBinding(dest.getName(), true);
+ postOffice.removeBinding(dest.getName(), postOffice.isClustered());
}
else
{
@@ -1366,7 +1366,7 @@
// Durable subs must be bound on ALL nodes of the cluster (if clustered)
- postOffice.addBinding(new Binding(new JMSCondition(false, jmsDestination.getName()), queue, true), true);
+ postOffice.addBinding(new Binding(new JMSCondition(false, jmsDestination.getName()), queue, true), postOffice.isClustered());
queue.activate();
@@ -1453,7 +1453,7 @@
// Durable subs must be bound on ALL nodes of the cluster
- postOffice.addBinding(new Binding(new JMSCondition(false, jmsDestination.getName()), queue, true), true);
+ postOffice.addBinding(new Binding(new JMSCondition(false, jmsDestination.getName()), queue, true), postOffice.isClustered());
queue.activate();
Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -646,8 +646,6 @@
lock.readLock().acquire();
- log.info(this + " getting state");
-
try
{
Iterator iter = nameMaps.values().iterator();
@@ -1681,13 +1679,6 @@
throw new IllegalStateException("Cannot find queues in condition map for condition " + binding.condition);
}
- Iterator i = queues.iterator();
- while (i.hasNext())
- {
- Queue q = (Queue)i.next();
- log.info("q:" + q);
- }
-
boolean removed = queues.remove(binding.queue);
if (!removed)
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterConnectionManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterConnectionManagerTest.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterConnectionManagerTest.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -130,7 +130,39 @@
suck();
}
+ // Package protected ----------------------------------------------------------------------------
+
+ // Protected ------------------------------------------------------------------------------------
+
+ protected void setUp() throws Exception
+ {
+ nodeCount = 2;
+ super.setUp();
+
+ log.debug("setup done");
+
+ //undeploy CF
+
+ String cfName =
+ (String)ServerManagement.getServer(1).getAttribute(ServerManagement.getServerPeerObjectName(), "ClusterPullConnectionFactoryName");
+
+ //undeploy cf on node 1
+ ServerManagement.undeployConnectionFactory(new ObjectName(cfName));
+ }
+
+ protected void tearDown() throws Exception
+ {
+ ServerManagement.undeployQueue("suckQueue", 0);
+
+ ServerManagement.undeployQueue("suckQueue", 1);
+
+ super.tearDown();
+ }
+
+ // Private --------------------------------------------------------------------------------------
+
+
private void deployCF() throws Exception
{
String cfName =
@@ -221,37 +253,7 @@
}
- // Package protected ----------------------------------------------------------------------------
- // Protected ------------------------------------------------------------------------------------
-
- protected void setUp() throws Exception
- {
- nodeCount = 2;
- super.setUp();
-
- log.debug("setup done");
-
- //undeploy CF
-
- String cfName =
- (String)ServerManagement.getServer(1).getAttribute(ServerManagement.getServerPeerObjectName(), "ClusterPullConnectionFactoryName");
-
- //undeploy cf on node 1
- ServerManagement.undeployConnectionFactory(new ObjectName(cfName));
- }
-
- protected void tearDown() throws Exception
- {
- ServerManagement.undeployQueue("suckQueue", 0);
-
- ServerManagement.undeployQueue("suckQueue", 1);
-
- super.tearDown();
- }
-
- // Private --------------------------------------------------------------------------------------
-
// Inner classes --------------------------------------------------------------------------------
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -147,13 +147,6 @@
messagesRead += readerThread[i].messagesRead;
}
- log.info("The test produced " + messagesProduced + " and read " + messagesRead);
-
- // This test bounces between commits and rollbacks in between several threads...
- // The test is then non deterministic to provide a counter... I will keep the log.info
- // but won't be doing an assertion here
- //assertEquals("Messages Produced must be the same as Messages Read", messagesProduced, messagesRead);
-
if (hasFailure)
{
fail ("An exception has occurred in one of the threads");
@@ -228,11 +221,6 @@
session = conn.createSession(true, Session.SESSION_TRANSACTED);
consumer = session.createConsumer((Destination)queue);
}
-
- if (messageCount % 50 == 0)
- {
- log.info("Reader " + index + " read " + messageCount + " messages");
- }
}
messagesRead += (messageCount - lastCount);
@@ -245,8 +233,6 @@
{
e.printStackTrace();
exceptions.add(e);
-// log.debug("ReaderThread " + index + " died");
-// System.exit(1);
}
}
@@ -304,19 +290,11 @@
messagesProduced += ((messageCount) - lastMessage);
sess.commit();
sess.close();
-
- if (messageCount % 50 == 0)
- {
- log.info("Producer " + index + " sent " + messageCount + " messages");
- }
-
}
catch (Exception e)
{
e.printStackTrace();
exceptions.add(e);
-// log.debug("ProducerThread " + index + " died");
-// System.exit(1);
}
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -74,7 +74,6 @@
{
threads[i] = new Thread(new Sender(sessions[i], producers[i]), "Sender Thread #" + i);
threads[i].start();
- log.info(threads[i].getName() + " started");
}
// wait for the threads to finish
@@ -130,8 +129,7 @@
while(true)
{
if (count == MESSAGE_COUNT)
- {
- log.info(Thread.currentThread().getName() + " done");
+ {
break;
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -284,12 +284,6 @@
{
TextMessage tm = sess.createTextMessage("message" + i);
-
-// if (i % 1000 == 0)
-// {
-// log.info("Publisher " + this + " sending message " + i);
-// }
-
prod.send(tm);
try
@@ -300,8 +294,6 @@
{
}
}
-
- log.info("Publisher " + this + " sent all messages");
}
catch (JMSException e)
{
@@ -350,12 +342,7 @@
synchronized void msgReceived()
{
- msgsReceived++;
-
-// if (msgsReceived % 1000 == 0)
-// {
-// log.info("Subscriber " + this + " received " + msgsReceived + " messages");
-// }
+ msgsReceived++;
}
synchronized int getMessagesReceived()
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/Receiver.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -215,9 +215,7 @@
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)
{
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/RecoveringReceiver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/RecoveringReceiver.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/RecoveringReceiver.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -93,8 +93,6 @@
String prodName = m.getStringProperty("PROD_NAME");
Integer msgCount = new Integer(m.getIntProperty("MSG_NUMBER"));
- // log.info("got " + prodName + ":" + msgCount);
-
Count count = (Count)counts.get(prodName);
if (count == null)
{
@@ -149,7 +147,6 @@
String prodName = m.getStringProperty("PROD_NAME");
Integer msgCount = new Integer(m.getIntProperty("MSG_NUMBER"));
- // log.info("got " + prodName + ":" + msgCount);
Count count = (Count)counts.get(prodName);
if (count == null)
{
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/RelayStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/RelayStressTest.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/RelayStressTest.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -105,26 +105,13 @@
{
try
{
- //log.info(this + " got message");
-
- //log.info("blah");
-
m.clearProperties();
m.setStringProperty("name", "Tim");
- //log.info("set property");
-
prod.send(m);
- //log.info("sent");
+ count++;
- count++;
-
- if (count % 100 == 0)
- {
- // log.info("relayed " + count + " messages");
- }
-
if (count == numMessages)
{
synchronized (this)
@@ -158,19 +145,13 @@
public void onMessage(Message m)
{
count++;
-
- if (count % 100 == 0)
- {
- //log.info("consumed " + count + " messages");
- }
-
+
if (count == numMessages * numRelayers)
{
synchronized (this)
{
done = true;
notify();
- //log.info(this + " done");
}
}
}
@@ -221,15 +202,8 @@
m.setStringProperty("name", "Watt");
prod.send(m);
-
- if (i % 100 == 0)
- {
- log.info("sent " + i + " messages");
- }
}
- log.info("sent messages");
-
for (int i = 0; i < numRelayers; i++)
{
synchronized (relayers[i])
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/Sender.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/Sender.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/Sender.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -64,7 +64,6 @@
Message m = sess.createMessage();
m.setStringProperty("PROD_NAME", prodName);
m.setIntProperty("MSG_NUMBER", count);
- // log.info("sent: " + prodName + ":" + count);
prod.send(m);
count++;
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -105,8 +105,6 @@
String prodName = m.getStringProperty("PROD_NAME");
Integer msgCount = new Integer(m.getIntProperty("MSG_NUMBER"));
- // log.info("got " + prodName + ":" + msgCount);
-
Count count = (Count)counts.get(prodName);
if (count == null)
{
@@ -168,9 +166,7 @@
}
String prodName = m.getStringProperty("PROD_NAME");
Integer msgCount = new Integer(m.getIntProperty("MSG_NUMBER"));
-
- // log.info("got " + prodName + ":" + msgCount);
-
+
Count count = (Count)counts.get(prodName);
if (count == null)
{
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/TransactionalReceiver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/TransactionalReceiver.java 2007-07-02 20:28:46 UTC (rev 2823)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/TransactionalReceiver.java 2007-07-02 21:38:39 UTC (rev 2824)
@@ -92,8 +92,6 @@
}
String prodName = m.getStringProperty("PROD_NAME");
Integer msgCount = new Integer(m.getIntProperty("MSG_NUMBER"));
-
- // log.info("got " + prodName + ":" + msgCount);
Count count = (Count)counts.get(prodName);
if (count == null)
@@ -150,8 +148,6 @@
String prodName = m.getStringProperty("PROD_NAME");
Integer msgCount = new Integer(m.getIntProperty("MSG_NUMBER"));
- // log.info("got " + prodName + ":" + msgCount);
-
Count count = (Count)counts.get(prodName);
if (count == null)
{
@@ -188,7 +184,6 @@
processingDone();
}
}
- log.info(this + " done");
finished();
}
catch (Exception e)
More information about the jboss-cvs-commits
mailing list