[Java] Store recordingId and commit position for failed election terms.

real-logic · Feb 16, 2019 · e305241 · e305241
1 parent a754175
commit e305241
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/Election.java b/aeron-cluster/src/main/java/io/aeron/cluster/Election.java
@@ -657,15 +657,16 @@ else if (nowMs > (timeOfLastUpdateMs + leaderHeartbeatIntervalMs))
     private int leaderTransition(final long nowMs)
     {
         consensusModuleAgent.becomeLeader(candidateTermId, logPosition, logSessionId);
+        final long recordingId = consensusModuleAgent.logRecordingId();
 
         for (long termId = leadershipTermId + 1; termId < candidateTermId; termId++)
         {
-            ctx.recordingLog().appendTerm(NULL_VALUE, termId, logPosition, nowMs);
+            ctx.recordingLog().appendTerm(recordingId, termId, logPosition, nowMs);
+            ctx.recordingLog().commitLogPosition(termId, logPosition);
         }
 
         leadershipTermId = candidateTermId;
-
-        ctx.recordingLog().appendTerm(consensusModuleAgent.logRecordingId(), leadershipTermId, logPosition, nowMs);
+        ctx.recordingLog().appendTerm(recordingId, leadershipTermId, logPosition, nowMs);
         ctx.recordingLog().force();
 
         state(State.LEADER_READY, nowMs);