QPID-3936: add more debug logs

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1328319 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 47 insertions, 0 deletions

diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
index ed29182c51..1d2d862301 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/Client.java
@@ -103,6 +103,10 @@ public class Client
 
     public void processInstruction(final Command command)
     {
+        if (LOGGER.isInfoEnabled())
+        {
+            LOGGER.info("Client " + getClientName() + " received command: " + command);
+        }
         String responseMessage = null;
         try
         {
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
index 89400b1f72..7d68a8d84c 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
@@ -143,6 +143,10 @@ public class ConsumerParticipant implements Participant
 
         if (!batchEnabled || batchComplete)
         {
+            if (LOGGER.isTraceEnabled() && batchEnabled)
+            {
+                LOGGER.trace("Committing: batch size " + _command.getBatchSize() );
+            }
             _jmsDelegate.commitOrAcknowledgeMessage(message, _command.getSessionName());
         }
 
@@ -161,6 +165,11 @@ public class ConsumerParticipant implements Participant
 
             if (batchEnabled && !batchComplete)
             {
+                if (LOGGER.isTraceEnabled())
+                {
+                    LOGGER.trace("Committing: batch size " + _command.getBatchSize() );
+                }
+
                 // commit/acknowledge remaining messages if necessary
                 _jmsDelegate.commitOrAcknowledgeMessage(message, _command.getSessionName());
             }
@@ -232,4 +241,10 @@ public class ConsumerParticipant implements Participant
     {
         return _command.getParticipantName();
     }
+
+    @Override
+    public String toString()
+    {
+        return "ConsumerParticipant [_command=" + _command + ", _startTime=" + _startTime + "]";
+    }
 }
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
index dee1391868..d5e307d50f 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
@@ -94,6 +94,10 @@ public class ParticipantExecutor
             ParticipantResult result = null;
             try
             {
+                if (LOGGER.isInfoEnabled())
+                {
+                    LOGGER.info("About to run participant " + _participant);
+                }
                 result = _participant.doIt(_client.getClientName());
             }
             catch (Throwable t)
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
index a46794f380..d40a62f947 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
@@ -88,6 +88,10 @@ public class ProducerParticipant implements Participant
 
             if (batchLimitReached)
             {
+                if (LOGGER.isTraceEnabled() && _command.getBatchSize() > 0)
+                {
+                    LOGGER.trace("Committing: batch size " + _command.getBatchSize() );
+                }
                 _jmsDelegate.commitOrAcknowledgeMessage(lastPublishedMessage, _command.getSessionName());
 
                 if (_command.getInterval() > 0)
@@ -107,6 +111,10 @@ public class ProducerParticipant implements Participant
         // commit the remaining batch messages
         if (_command.getBatchSize() > 0 && numberOfMessagesSent % _command.getBatchSize() != 0)
         {
+            if (LOGGER.isTraceEnabled())
+            {
+                LOGGER.trace("Committing: batch size " + _command.getBatchSize() );
+            }
             _jmsDelegate.commitOrAcknowledgeMessage(lastPublishedMessage, _command.getSessionName());
         }
 
@@ -155,4 +163,10 @@ public class ProducerParticipant implements Participant
     {
         return _command.getParticipantName();
     }
+
+    @Override
+    public String toString()
+    {
+        return "ProducerParticipant [command=" + _command + "]";
+    }
 }
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
index a3c2c57473..282b933607 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
@@ -191,7 +191,10 @@ public class ClientJmsDelegate
                                 command);
             }
             final boolean transacted = command.getAcknowledgeMode() == Session.SESSION_TRANSACTED;
+
             final Session newSession = connection.createSession(transacted, command.getAcknowledgeMode());
+            LOGGER.info("Created session " + command.getSessionName() + " with transacted = " + newSession.getTransacted() + " and acknowledgeMode = " + newSession.getAcknowledgeMode());
+
             addSession(command.getSessionName(), newSession);
         }
         catch (final JMSException jmse)
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
index f5d4a3ae9b..b1caa6ef75 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/message/CreateParticpantCommand.java
@@ -19,6 +19,8 @@
  */
 package org.apache.qpid.disttest.message;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 public abstract class CreateParticpantCommand extends Command
 {
     private String _participantName;
@@ -93,4 +95,9 @@ public abstract class CreateParticpantCommand extends Command
         _maximumDuration = maximumDuration;
     }
 
+    @Override
+    public String toString()
+    {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }