[jboss-cvs] JBoss Messaging SVN: r6772 - in trunk: src/main/org/jboss/messaging/core/server/impl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 13 12:35:00 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-05-13 12:34:59 -0400 (Wed, 13 May 2009)
New Revision: 6772
Modified:
trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java
Log:
https://jira.jboss.org/jira/browse/JBMESSAGING-1558 - Removing traces and extra methods
Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java 2009-05-13 15:16:38 UTC (rev 6771)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java 2009-05-13 16:34:59 UTC (rev 6772)
@@ -129,11 +129,6 @@
log.trace(message);
}
- private static void trace(final String message, Exception t)
- {
- log.trace(message, t);
- }
-
// Constructors --------------------------------------------------
public PagingStoreImpl(final PagingManager pagingManager,
@@ -394,17 +389,6 @@
}
currentPageLock.readLock().lock();
- if (isTrace)
- {
- if (pagingManager.isBackup())
- {
- trace("Paging Reference[" + message.getMessage(null).getMessageID() + "] on Backup");
- }
- else
- {
- trace("Paging Reference[" + message.getMessage(null).getMessageID() + "] on Live");
- }
- }
try
{
@@ -485,11 +469,6 @@
{
if (!depaging.get())
{
- if (isTrace)
- {
- trace("Starting depaging for " + this.getStoreName(), new Exception ("trace"));
- }
-
depaging.set(true);
Runnable depageAction = new DepageRunnable(executor);
executor.execute(depageAction);
@@ -957,11 +936,6 @@
final boolean globalFull = isGlobalFull(getPageSizeBytes());
if (pageFull || globalFull || !isPaging())
{
- if (isTrace)
- {
- trace("clearDepage::true");
- }
-
depaging.set(false);
if (!globalFull)
{
@@ -971,11 +945,6 @@
}
else
{
- if (isTrace)
- {
- trace("clearDepage::false");
- }
-
return false;
}
}
@@ -1064,10 +1033,6 @@
// the lock and this would dead lock
if (running && !clearDepage())
{
- if (isTrace)
- {
- trace("Scheduling to depage " + PagingStoreImpl.this.getStoreName());
- }
followingExecutor.execute(this);
}
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2009-05-13 15:16:38 UTC (rev 6771)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2009-05-13 16:34:59 UTC (rev 6772)
@@ -339,11 +339,6 @@
return;
}
- if (trace)
- {
- log.trace("Trying to lock queue=" + this.name + ", backup=" + this.backup, new Exception("trace"));
- }
-
try
{
lock.acquire();
@@ -352,11 +347,6 @@
{
log.warn(e.getMessage(), e);
}
-
- if (trace)
- {
- log.trace("Locked, queue=" + this.name + ", backup=" + this.backup, new Exception("trace"));
- }
}
public void unlockDelivery()
@@ -367,11 +357,6 @@
}
lock.release();
-
- if (trace)
- {
- log.trace("UN-Locked, queue=" + this.name + ", backup = " + this.backup, new Exception("trace"));
- }
}
public boolean isDurable()
@@ -406,11 +391,6 @@
public void addLast(final MessageReference ref)
{
-
- if (trace)
- {
- log.trace("AddLast(" + this.getName() + (backup?"@Backup":"@Live") + "::" + ref);
- }
add(ref, false);
}
@@ -1040,12 +1020,6 @@
// Public
// -----------------------------------------------------------------------------
- /** To be used on tests only. Do not use it otherwise */
- public PriorityLinkedList<MessageReference> getReferencesList()
- {
- return this.messageReferences;
- }
-
@Override
public boolean equals(final Object other)
{
@@ -1609,11 +1583,6 @@
queues.add(ref.getQueue());
}
- for (MessageReference ref : refsToAdd)
- {
- queues.add(ref.getQueue());
- }
-
return queues;
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2009-05-13 15:16:38 UTC (rev 6771)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2009-05-13 16:34:59 UTC (rev 6772)
@@ -240,18 +240,9 @@
{
MessageReference ref = iter.next();
- if (trace)
- {
- log.trace("Adding reference " + ref + " into a Transaction for close/cancel");
- }
-
ref.getQueue().cancel(tx, ref);
}
- if (trace)
- {
- log.trace("***************** tx.rollback being called now *****************");
- }
tx.rollback();
if (!browseOnly)
@@ -439,11 +430,6 @@
public void deliverReplicated(final long messageID) throws Exception
{
- if (trace)
- {
- log.trace("Replicating delivery Reference[" + messageID + "] queueOnConsumer=" + messageQueue.getName());
- }
-
MessageReference ref = messageQueue.removeFirstReference(messageID);
if (ref == null)
@@ -513,24 +499,6 @@
return availableCredits;
}
- /** To be used on tests only */
- public java.util.Queue<MessageReference> getDeliveringRefs()
- {
- return deliveringRefs;
- }
-
- /** To be used on tests only */
- public ServerSession getSession()
- {
- return session;
- }
-
- /** To be used on tests only */
- public long getReplicatedSessionID()
- {
- return replicatedSessionID;
- }
-
// Private --------------------------------------------------------------------------------------
private void promptDelivery()
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java 2009-05-13 15:16:38 UTC (rev 6771)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java 2009-05-13 16:34:59 UTC (rev 6772)
@@ -467,8 +467,6 @@
assertEquals(0, errors.get());
- compareConsumers(ADDRESS, PROPERTY_KEY, NTHREADS / 2);
-
for (ConsumerThread t : cthreads)
{
if (t.sess != null)
@@ -687,8 +685,6 @@
assertEquals(0, errors.get());
- compareConsumers(ADDRESS, PROPERTY_KEY, NTHREADS / 2);
-
for (ConsumerThread t : cthreads)
{
if (t.sess != null)
@@ -707,107 +703,6 @@
}
/**
- * Compare if Consumers between Backup and Live server are identical
- * @param ADDRESS
- * @param propertyToAssert
- * @param NTHREADS
- * @param NMESSAGES
- * @throws Exception
- */
- private void compareConsumers(final SimpleString ADDRESS,
- final SimpleString propertyToAssert,
- int expectedNumberOfConsumers) throws Exception
- {
- List<QueueBinding> blive = getLocalQueueBindings(liveServer.getPostOffice(), ADDRESS.toString());
- List<QueueBinding> bbackup = getLocalQueueBindings(backupServer.getPostOffice(), ADDRESS.toString());
-
- assertEquals(1, blive.size());
- assertEquals(1, bbackup.size());
-
- QueueImpl qlive = (QueueImpl)blive.get(0).getQueue();
- QueueImpl qbackup = (QueueImpl)bbackup.get(0).getQueue();
-
- assertEquals(expectedNumberOfConsumers, qlive.getConsumerCount());
-
- assertEquals(expectedNumberOfConsumers, qbackup.getConsumerCount());
-
- debug("*****************************************************************************************");
- debug("LiveConsumers:");
- for (Consumer c : qlive.getConsumers())
- {
- ServerConsumerImpl sc = ((ServerConsumerImpl)c);
- debug("ID: " + sc.getID() +
- " SessionID = " +
- sc.getSession().getID() +
- " ReplicateSession = " +
- sc.getReplicatedSessionID());
- }
-
- debug("*****************************************************************************************");
- debug("BackupConsumers:");
- for (Consumer c : qbackup.getConsumers())
- {
- ServerConsumerImpl sc = ((ServerConsumerImpl)c);
- debug("ID: " + sc.getID() +
- " SessionID = " +
- sc.getSession().getID() +
- " ReplicateSession = " +
- sc.getReplicatedSessionID());
- }
-
- for (Consumer c1 : qlive.getConsumers())
- {
- ServerConsumerImpl liveConsumer = (ServerConsumerImpl)c1;
-
- ServerConsumerImpl backupConsumer = null;
-
- for (Consumer c2 : qbackup.getConsumers())
- {
- ServerConsumerImpl tmp2 = (ServerConsumerImpl)c2;
- if (liveConsumer.getID() == tmp2.getID() && tmp2.getSession().getID() == liveConsumer.getReplicatedSessionID())
- {
- backupConsumer = tmp2;
- break;
- }
- }
-
- assertNotNull("Couldn't find a consumerID=" + liveConsumer.getID() + " on the backup node", backupConsumer);
-
- long timeout = System.currentTimeMillis() + 5000;
-
- // This is async, so a timed out check
- while (System.currentTimeMillis() < timeout && liveConsumer.getDeliveringRefs().size() != backupConsumer.getDeliveringRefs()
- .size())
- {
- Thread.sleep(10);
- }
-
- assertEquals("Consumer ID = " + liveConsumer.getID() +
- " didn't have the same number of deliveries between live and backup node",
- liveConsumer.getDeliveringRefs().size(),
- backupConsumer.getDeliveringRefs().size());
-
- Iterator<MessageReference> iterBackup = backupConsumer.getDeliveringRefs().iterator();
- for (MessageReference refLive : liveConsumer.getDeliveringRefs())
- {
- MessageReference refBackup = iterBackup.next();
-
- assertEquals(refLive.getMessage().getMessageID(), refBackup.getMessage().getMessageID());
-
- // debug("Property on live = " + refLive.getMessage().getProperty(propertyToAssert));
- // debug("Property on backup = " + refBackup.getMessage().getProperty(propertyToAssert));
-
- assertNotNull(refLive.getMessage().getProperty(propertyToAssert));
- assertTrue(refLive.getMessage()
- .getProperty(propertyToAssert)
- .equals(refBackup.getMessage().getProperty(propertyToAssert)));
- }
-
- assertFalse(iterBackup.hasNext());
- }
- }
-
- /**
* Compare if a Queue on Backup and Live server are identical
* @param ADDRESS
* @param propertyToAssert
@@ -828,13 +723,13 @@
QueueImpl qlive = (QueueImpl)blive.get(0).getQueue();
QueueImpl qbackup = (QueueImpl)bbackup.get(0).getQueue();
- assertEquals(expectedNumberOfMessages, qlive.getReferencesList().size());
+ assertEquals(expectedNumberOfMessages, qlive.list(null).size());
- assertEquals(expectedNumberOfMessages, qbackup.getReferencesList().size());
+ assertEquals(expectedNumberOfMessages, qbackup.list(null).size());
- Iterator<MessageReference> iterBackup = qbackup.getReferencesList().iterator();
+ Iterator<MessageReference> iterBackup = qbackup.list(null).iterator();
- for (MessageReference refLive : qlive.getReferencesList())
+ for (MessageReference refLive : qlive.list(null))
{
assertTrue(iterBackup.hasNext());
MessageReference refBackup = iterBackup.next();
More information about the jboss-cvs-commits
mailing list