[hornetq-commits] JBoss hornetq SVN: r9426 - trunk/src/main/org/hornetq/core/journal/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-07-19 15:11:34 -0400 (Mon, 19 Jul 2010)
New Revision: 9426

Modified:
   trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
Log:
Tweaks on logging only

Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java	2010-07-19 16:09:02 UTC (rev 9425)
+++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java	2010-07-19 19:11:34 UTC (rev 9426)
@@ -581,6 +581,8 @@
                JournalImpl.trace("Record at position " + pos +
                                  " recordType = " +
                                  recordType +
+                                 " possible transactionID = " + transactionID + 
+                                 " possible recordID = " + recordID +
                                  " file:" +
                                  file.getFile().getFileName() +
                                  " is corrupted and it is being ignored (III)");
@@ -749,10 +751,6 @@
                                final boolean sync,
                                final IOCompletion callback) throws Exception
    {
-      if (JournalImpl.LOAD_TRACE)
-      {
-         JournalImpl.trace("appendAddRecord id = " + id + ", recordType = " + recordType);
-      }
       if (state != JournalImpl.STATE_LOADED)
       {
          throw new IllegalStateException("Journal must be loaded first");
@@ -762,6 +760,11 @@
 
       try
       {
+         if (JournalImpl.LOAD_TRACE)
+         {
+            JournalImpl.trace("appendAddRecord id = " + id + ", recordType = " + recordType + " compacting = " + (compactor != null));
+         }
+
          JournalInternalRecord addRecord = new JournalAddRecord(true, id, recordType, record);
 
          if (callback != null)
@@ -969,14 +972,6 @@
                                             final byte recordType,
                                             final EncodingSupport record) throws Exception
    {
-      if (JournalImpl.LOAD_TRACE)
-      {
-         JournalImpl.trace("appendAddRecordTransactional txID " + txID +
-                           ", id = " +
-                           id +
-                           ", recordType = " +
-                           recordType);
-      }
       if (state != JournalImpl.STATE_LOADED)
       {
          throw new IllegalStateException("Journal must be loaded first");
@@ -986,6 +981,15 @@
 
       try
       {
+         if (JournalImpl.LOAD_TRACE)
+         {
+            JournalImpl.trace("appendAddRecordTransactional txID " + txID +
+                              ", id = " +
+                              id +
+                              ", recordType = " +
+                              recordType +
+                              ", compacting " + (this.compactor != null));
+         }
 
          JournalInternalRecord addRecord = new JournalAddRecordTX(true, txID, id, recordType, record);
 
@@ -1022,14 +1026,6 @@
                                                final byte recordType,
                                                final EncodingSupport record) throws Exception
    {
-      if (JournalImpl.LOAD_TRACE)
-      {
-         JournalImpl.trace("appendUpdateRecordTransactional txID " + txID +
-                           ", id = " +
-                           id +
-                           ", recordType = " +
-                           recordType);
-      }
       if (state != JournalImpl.STATE_LOADED)
       {
          throw new IllegalStateException("Journal must be loaded first");
@@ -1039,6 +1035,14 @@
 
       try
       {
+         if (JournalImpl.LOAD_TRACE)
+         {
+            JournalImpl.trace("appendUpdateRecordTransactional txID " + txID +
+                              ", id = " +
+                              id +
+                              ", recordType = " +
+                              recordType + ", compacting = " + (compactor != null));
+         }
 
          JournalInternalRecord updateRecordTX = new JournalAddRecordTX(false, txID, id, recordType, record);
 
@@ -1156,10 +1160,6 @@
                                    final boolean sync,
                                    final IOCompletion callback) throws Exception
    {
-      if (JournalImpl.LOAD_TRACE)
-      {
-         JournalImpl.trace("appendPrepareRecord txID " + txID);
-      }
 
       if (state != JournalImpl.STATE_LOADED)
       {
@@ -1173,6 +1173,11 @@
       try
       {
 
+         if (JournalImpl.LOAD_TRACE)
+         {
+            JournalImpl.trace("appendPrepareRecord txID " + txID + ", compacting = " + (compactor != null));
+         }
+
          JournalInternalRecord prepareRecord = new JournalCompleteRecordTX(false, txID, transactionData);
 
          if (callback != null)
@@ -1241,7 +1246,12 @@
 
       try
       {
+         if (JournalImpl.LOAD_TRACE)
+         {
+            JournalImpl.trace("appendCommitRecord txID " + txID + ", compacting = " + (compactor != null));
+         }
 
+
          if (tx == null)
          {
             throw new IllegalStateException("Cannot find tx with id " + txID);