Update from trunk r1375509 through r1450773asyncstore

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

1 files changed, 29 insertions, 2 deletions

diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
index fe1556b5a6..598d20146c 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
+++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
@@ -80,7 +80,7 @@ public class CommitThreadWrapper
         {
             if (LOGGER.isDebugEnabled())
             {
-                LOGGER.debug("public synchronized void complete(): called (Transaction = " + _tx + ")");
+                LOGGER.debug("complete() called for transaction " + _tx);
             }
             _complete = true;
 
@@ -101,7 +101,10 @@ public class CommitThreadWrapper
 
             if(!_syncCommit)
             {
-                LOGGER.debug("CommitAsync was requested, returning immediately.");
+                if(LOGGER.isDebugEnabled())
+                {
+                    LOGGER.debug("CommitAsync was requested, returning immediately.");
+                }
                 return;
             }
 
@@ -121,6 +124,12 @@ public class CommitThreadWrapper
 
         public synchronized void waitForCompletion()
         {
+            long startTime = 0;
+            if(LOGGER.isDebugEnabled())
+            {
+                startTime = System.currentTimeMillis();
+            }
+
             while (!isComplete())
             {
                 _commitThread.explicitNotify();
@@ -133,6 +142,12 @@ public class CommitThreadWrapper
                     throw new RuntimeException(e);
                 }
             }
+
+            if(LOGGER.isDebugEnabled())
+            {
+                long duration = System.currentTimeMillis() - startTime;
+                LOGGER.debug("waitForCompletion returning after " + duration + " ms for transaction " + _tx);
+            }
         }
     }
 
@@ -198,8 +213,20 @@ public class CommitThreadWrapper
 
             try
             {
+                long startTime = 0;
+                if(LOGGER.isDebugEnabled())
+                {
+                    startTime = System.currentTimeMillis();
+                }
+
                 _environment.flushLog(true);
 
+                if(LOGGER.isDebugEnabled())
+                {
+                    long duration = System.currentTimeMillis() - startTime;
+                    LOGGER.debug("flushLog completed in " + duration  + " ms");
+                }
+
                 for(int i = 0; i < size; i++)
                 {
                     BDBCommitFuture commit = _jobQueue.poll();