Log indexed entries after writing to the log on Raft followers.

atomix · Jul 16, 2017 · 8fb6917 · 8fb6917
1 parent c90c75d
commit 8fb6917
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/roles/LeaderRole.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/roles/LeaderRole.java
@@ -121,8 +121,8 @@ private void appendInitialEntries() {
     final long term = context.getTerm();
 
     final RaftLogWriter writer = context.getLogWriter();
-    final Indexed<RaftLogEntry> indexed = writer.append(new InitializeEntry(term, appender.getTime()));
+    final Indexed<RaftLogEntry> entry = writer.append(new InitializeEntry(term, appender.getTime()));
-    log.trace("Appended {}", indexed.index());
+    log.trace("Appended {}", entry);
 
     // Append a configuration entry to propagate the leader's cluster configuration.
     configure(context.getCluster().getMembers());

diff --git a/protocols/raft/src/main/java/io/atomix/protocols/raft/roles/PassiveRole.java b/protocols/raft/src/main/java/io/atomix/protocols/raft/roles/PassiveRole.java
@@ -227,8 +227,8 @@ protected void appendEntries(AppendRequest request, CompletableFuture<AppendResp
             // the log and append the leader's entry.
             if (existingEntry.entry().term() != entry.term()) {
               writer.truncate(index - 1);
-              writer.append(entry);
+              Indexed<RaftLogEntry> indexed = writer.append(entry);
-              log.trace("Appended {} at index {}", entry, index);
+              log.trace("Appended {}", indexed);
             }
           }
           // If the last written entry is equal to the append entry index, we don't need
@@ -238,8 +238,8 @@ else if (lastEntry.index() == index) {
             // the log and append the leader's entry.
             if (lastEntry.entry().term() != entry.term()) {
               writer.truncate(index - 1);
-              writer.append(entry);
+              Indexed<RaftLogEntry> indexed = writer.append(entry);
-              log.trace("Appended {} at index {}", entry, index);
+              log.trace("Appended {}", indexed);
             }
           }
           // Otherwise, this entry is being appended at the end of the log.
@@ -250,14 +250,14 @@ else if (lastEntry.index() == index) {
             }
 
             // Append the entry and log a message.
-            writer.append(entry);
+            Indexed<RaftLogEntry> indexed = writer.append(entry);
-            log.trace("Appended {} at index {}", entry, index);
+            log.trace("Appended {}", indexed);
           }
         }
         // Otherwise, if the last entry is null just append the entry and log a message.
         else {
-          writer.append(entry);
+          Indexed<RaftLogEntry> indexed = writer.append(entry);
-          log.trace("Appended {} at index {}", entry, index);
+          log.trace("Appended {}", indexed);
         }
 
         // If the last log index meets the commitIndex, break the append loop to avoid appending uncommitted entries.