Add additional logging to segment creation, recycling and replay (#660)

Co-authored-by: ines potier <[email protected]>

Author: inespot

src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java

@@ -30,6 +30,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import com.palantir.logsafe.SafeArg;
 import com.google.common.base.Predicate;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Iterables;
@@ -136,7 +137,9 @@ public static CommitLogReplayer construct(CommitLog commitLog)
         }
         if (globalPosition == null)
             globalPosition = ReplayPosition.firstNotCovered(cfPersisted.values());
-        logger.debug("Global replay position is {} from columnfamilies {}", globalPosition, FBUtilities.toString(cfPersisted));
+        logger.debug("Global replay position {} is from columnfamilies {}",
+                     SafeArg.of("globalPosition", globalPosition),
+                     SafeArg.of("columnFamilies", FBUtilities.toString(cfPersisted)));
         return new CommitLogReplayer(commitLog, globalPosition, cfPersisted, replayFilter);
     }
 
@@ -399,8 +402,10 @@ public void recover(File file, boolean tolerateTruncation) throws IOException
             {
                 int replayPos = replayEnd + CommitLogSegment.SYNC_MARKER_SIZE;
 
-                if (logger.isTraceEnabled())
-                    logger.trace("Replaying {} between {} and {}", file, reader.getFilePointer(), end);
+                logger.debug("Replaying {} between {} and {}",
+                             SafeArg.of("file", file.getName()),
+                             SafeArg.of("start", reader.getFilePointer()),
+                             SafeArg.of("end", end));
                 if (compressor != null)
                 {
                     int uncompressedLength = reader.readInt();
@@ -473,7 +478,7 @@ public boolean logAndCheckIfShouldSkip(File file, CommitLogDescriptor desc)
 
         if (globalPosition.segment > desc.id)
         {
-            logger.trace("skipping replay of fully-flushed {}", file);
+            logger.debug("Skipping replay of fully-flushed {}", SafeArg.of("file", file.getName()));
             return true;
         }
         return false;

src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java

@@ -34,6 +34,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
+import com.palantir.logsafe.SafeArg;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.*;
@@ -118,9 +119,11 @@ public void runMayThrow() throws Exception
                             // if we have no more work to do, check if we should create a new segment
                             if (availableSegments.isEmpty() && (activeSegments.isEmpty() || createReserveSegments))
                             {
-                                logger.trace("No segments in reserve; creating a fresh one");
                                 // TODO : some error handling in case we fail to create a new segment
-                                availableSegments.add(CommitLogSegment.createSegment(commitLog));
+                                CommitLogSegment newSegment = CommitLogSegment.createSegment(commitLog);
+                                availableSegments.add(newSegment);
+                                logger.info("No segments in reserve; created a fresh one",
+                                            SafeArg.of("segment", newSegment.id));
                                 hasAvailableSegments.signalAll();
                             }
 
@@ -374,7 +377,9 @@ void recycleSegment(final File file)
      */
     private void discardSegment(final CommitLogSegment segment, final boolean deleteFile)
     {
-        logger.trace("Segment {} is no longer active and will be deleted {}", segment, deleteFile ? "now" : "by the archive script");
+        logger.debug("Segment {} is no longer active and will be deleted {}",
+                     SafeArg.of("segment", segment.id),
+                     SafeArg.of("deleteNow", deleteFile));
 
         segmentManagementTasks.add(new Runnable()
         {