ratis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject incubator-ratis git commit: RATIS-444. Improve logging in RaftLogWorker. Contributed by Lokesh Jain
Date Tue, 04 Dec 2018 19:08:11 GMT
Repository: incubator-ratis
Updated Branches:
  refs/heads/master 9296a3bc0 -> a56bfcebd


RATIS-444. Improve logging in RaftLogWorker.  Contributed by Lokesh Jain


Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/a56bfceb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/a56bfceb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/a56bfceb

Branch: refs/heads/master
Commit: a56bfcebd5bc44582a51fb0679a14fb5802f8702
Parents: 9296a3b
Author: Tsz Wo Nicholas Sze <szetszwo@apache.org>
Authored: Tue Dec 4 11:07:35 2018 -0800
Committer: Tsz Wo Nicholas Sze <szetszwo@apache.org>
Committed: Tue Dec 4 11:07:35 2018 -0800

----------------------------------------------------------------------
 .../ratis/server/storage/RaftLogWorker.java      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/a56bfceb/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java
----------------------------------------------------------------------
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java
b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java
index 8e1c855..06eda5e 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java
@@ -292,11 +292,12 @@ class RaftLogWorker implements Runnable {
    * Thus all the tasks are created and added sequentially.
    */
   void startLogSegment(long startIndex) {
+    LOG.info("{}: Starting segment from index:{}", name, startIndex);
     addIOTask(new StartLogSegment(startIndex));
   }
 
   void rollLogSegment(LogSegment segmentToClose) {
-    LOG.info("Rolling segment:{} index to:{}", name,
+    LOG.info("{}: Rolling segment to index:{}", name,
         (segmentToClose.getEndIndex() + 1));
     addIOTask(new FinalizeLogSegment(segmentToClose));
     addIOTask(new StartLogSegment(segmentToClose.getEndIndex() + 1));
@@ -307,6 +308,7 @@ class RaftLogWorker implements Runnable {
   }
 
   Task truncate(TruncationSegments ts) {
+    LOG.info("{}: Truncating segments {}", name, ts);
     return addIOTask(new TruncateLog(ts));
   }
 
@@ -381,7 +383,6 @@ class RaftLogWorker implements Runnable {
 
       File openFile = storage.getStorageDir()
           .getOpenLogFile(segmentToClose.getStartIndex());
-      LOG.debug("{} finalizing log segment {}", name, openFile);
       Preconditions.assertTrue(openFile.exists(),
           () -> name + ": File " + openFile + " does not exist, segmentToClose="
               + segmentToClose.toDebugString());
@@ -392,8 +393,10 @@ class RaftLogWorker implements Runnable {
         Preconditions.assertTrue(!dstFile.exists());
 
         FileUtils.move(openFile, dstFile);
+        LOG.info("{}: Rolled log segment from {} to {}", name, openFile, dstFile);
       } else { // delete the file of the empty segment
         FileUtils.deleteFile(openFile);
+        LOG.info("{}: Deleted empty log segment {}", name, openFile);
       }
       updateFlushedIndex();
     }
@@ -419,7 +422,6 @@ class RaftLogWorker implements Runnable {
     @Override
     void execute() throws IOException {
       File openFile = storage.getStorageDir().getOpenLogFile(newStartIndex);
-      LOG.debug("{} creating new log segment {}", name, openFile);
       Preconditions.assertTrue(!openFile.exists(), "open file %s exists for %s",
           openFile, name);
       Preconditions.assertTrue(out == null && pendingFlushNum == 0);
@@ -427,6 +429,7 @@ class RaftLogWorker implements Runnable {
           preallocatedSize, bufferSize);
       Preconditions.assertTrue(openFile.exists(), "Failed to create file %s for %s",
           openFile.getAbsolutePath(), name);
+      LOG.info("{}: created new log segment {}", name, openFile);
     }
 
     @Override
@@ -453,13 +456,18 @@ class RaftLogWorker implements Runnable {
             storage.getStorageDir().getClosedLogFile(
                 segments.toTruncate.startIndex,
                 segments.toTruncate.endIndex);
+        Preconditions.assertTrue(fileToTruncate.exists(),
+            "File %s to be truncated does not exist", fileToTruncate);
         FileUtils.truncateFile(fileToTruncate, segments.toTruncate.targetLength);
 
         // rename the file
         File dstFile = storage.getStorageDir().getClosedLogFile(
             segments.toTruncate.startIndex, segments.toTruncate.newEndIndex);
-        Preconditions.assertTrue(!dstFile.exists());
+        Preconditions.assertTrue(!dstFile.exists(),
+            "Truncated file %s already exists ", dstFile);
         FileUtils.move(fileToTruncate, dstFile);
+        LOG.info("{}: Truncated log file {} to length {} and moved it to {}", name,
+            fileToTruncate, segments.toTruncate.targetLength, dstFile);
 
         // update lastWrittenIndex
         lastWrittenIndex = segments.toTruncate.newEndIndex;
@@ -474,7 +482,10 @@ class RaftLogWorker implements Runnable {
             delFile = storage.getStorageDir()
                 .getClosedLogFile(del.startIndex, del.endIndex);
           }
+          Preconditions.assertTrue(delFile.exists(),
+              "File %s to be deleted does not exist", delFile);
           FileUtils.deleteFile(delFile);
+          LOG.info("{}: Deleted log file {}", name, delFile);
           minStart = Math.min(minStart, del.startIndex);
         }
         if (segments.toTruncate == null) {


Mime
View raw message