[jboss-cvs] JBoss Messaging SVN: r7692 - trunk/src/main/org/jboss/messaging/core/journal/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2009-08-07 17:02:12 -0400 (Fri, 07 Aug 2009)
New Revision: 7692

Modified:
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalCompactor.java
   trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
Log:
removed inappropriate log.info statments

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalCompactor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalCompactor.java	2009-08-07 17:34:44 UTC (rev 7691)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalCompactor.java	2009-08-07 21:02:12 UTC (rev 7692)
@@ -560,8 +560,7 @@
       currentFile = journal.getFile(false, false, false);
       sequentialFile = currentFile.getFile();
       sequentialFile.renameTo(sequentialFile.getFileName() + ".cmp");
-      
-      log.info("Writing compacted data into " + sequentialFile.getFileName());
+            
       sequentialFile.open(1);
       fileID = nextOrderingID++;
       currentFile = new JournalFileImpl(sequentialFile, fileID);

Modified: trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-08-07 17:34:44 UTC (rev 7691)
+++ trunk/src/main/org/jboss/messaging/core/journal/impl/JournalImpl.java	2009-08-07 21:02:12 UTC (rev 7692)
@@ -1475,8 +1475,7 @@
          // Read the files, and use the JournalCompactor class to create the new outputFiles, and the new collections as
          // well
          for (final JournalFile file : dataFilesToProcess)
-         {
-            log.info("Compacting file " + file.getFile().getFileName() + ", internalID = " + file.getFileID());
+         {            
             readJournalFile(fileFactory, file, compactor);
          }
 
@@ -2073,13 +2072,6 @@
 
       if (totalLiveSize < compactMargin && !compactorRunning.get() && dataFiles.length > compactMinFiles)
       {
-
-         log.info("Compacting being started, numberOfDataFiles = " + dataFiles.length +
-                  ", liveSize = " +
-                  totalLiveSize +
-                  ", margin to start compacting = " +
-                  compactMargin);
-
          if (!compactorRunning.compareAndSet(false, true))
          {
             return;
@@ -2970,12 +2962,9 @@
       SequentialFile controlFile = JournalCompactor.readControlFile(fileFactory, dataFiles, newFiles);
       if (controlFile != null)
       {
-         log.info("Journal Compactor was interrupted during renaming phase, renaming files");
-
          for (String dataFile : dataFiles)
          {
-            SequentialFile file = fileFactory.createSequentialFile(dataFile, 1);
-            log.info("Removing old compacted file" + file.getFileName());
+            SequentialFile file = fileFactory.createSequentialFile(dataFile, 1);           
             if (file.exists())
             {
                file.delete();
@@ -2984,8 +2973,7 @@
 
          for (String newFile : newFiles)
          {
-            SequentialFile file = fileFactory.createSequentialFile(newFile, 1);
-            log.info("Renaming file " + file.getFileName() + " as an part of the data files");
+            SequentialFile file = fileFactory.createSequentialFile(newFile, 1);           
             if (file.exists())
             {
                final String originalName = file.getFileName();