Merge pull request #172 from aalda/remove-term-checks

Remove term checks in fsm
BBVA · Oct 1, 2019 · 60ace2e · 60ace2e
2 parents 4f50b5c + dce22d2
commit 60ace2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/consensus/fsm.go b/consensus/fsm.go
@@ -48,7 +48,7 @@ func (m *VersionMetadata) decode(value []byte) error {
 }
 
 type fsmState struct {
-	Index, Term, BalloonVersion uint64
+	Index, BalloonVersion uint64
 }
 
 func (s *fsmState) encode() ([]byte, error) {
@@ -61,11 +61,7 @@ func (s *fsmState) decode(value []byte) error {
 
 func (s *fsmState) shouldApply(f *fsmState) bool {
 
-	if s.Term > f.Term {
-		return false
-	}
-
-	if s.Term == f.Term && s.Index >= f.Index && s.Index != 0 {
+	if s.Index >= f.Index && s.Index != 0 {
 		return false
 	}
 
@@ -190,7 +186,7 @@ func (n *RaftNode) Apply(l *raft.Log) interface{} {
 		if err := cmd.decode(&eventDigests); err != nil {
 			panic(fmt.Sprintf("Unable to decode command: %v", err))
 		}
-		newState := &fsmState{l.Index, l.Term, n.balloon.Version() + uint64(len(eventDigests)) - 1}
+		newState := &fsmState{l.Index, n.balloon.Version() + uint64(len(eventDigests)) - 1}
 		if n.state.shouldApply(newState) {
 			return n.applyAdd(eventDigests, newState)
 		}

diff --git a/consensus/snapshot_test.go b/consensus/snapshot_test.go
@@ -170,7 +170,7 @@ func TestRestoreFromLeaderWAL(t *testing.T) {
 	//wait for WAL replication
 	require.Truef(t,
 		retryTrue(20, 200*time.Millisecond, func() bool {
-			return node1.state.Term == node3.state.Term && node1.state.Index == node3.state.Index
+			return node1.state.Index == node3.state.Index
 		}), "WAL not in sync")
 
 	// take a snapshot to inspect its values
@@ -251,7 +251,7 @@ func TestRestoreFromLeaderSnapshot(t *testing.T) {
 	//wait for WAL replication
 	require.Truef(t,
 		retryTrue(20, 200*time.Millisecond, func() bool {
-			return node1.state.Term == node3.state.Term && node1.state.Index == node3.state.Index
+			return node1.state.Index == node3.state.Index
 		}), "WAL not in sync")
 
 	// take a snapshot to inspect its values
@@ -326,7 +326,7 @@ func TestRestoreNewNodeFromLeader(t *testing.T) {
 	// wait for WAL replication
 	require.Truef(t,
 		retryTrue(20, 200*time.Millisecond, func() bool {
-			return node1.state.Term == node3.state.Term && node1.state.Index == node3.state.Index
+			return node1.state.Index == node3.state.Index
 		}), "WAL not in sync")
 
 	// take a snapshot to inspect its values
@@ -439,7 +439,7 @@ func TestRestoreNewNodeFromChangedLeader(t *testing.T) {
 	// wait for WAL replication
 	require.Truef(t,
 		retryTrue(20, 200*time.Millisecond, func() bool {
-			return node1.state.Term == node3.state.Term && node1.state.Index == node3.state.Index
+			return node1.state.Index == node3.state.Index
 		}), "WAL not in sync")
 
 	// take a snapshot to inspect its values
@@ -488,7 +488,7 @@ func TestRestoreOldNodeFromChangedLeader(t *testing.T) {
 	// wait for WAL replication
 	require.Truef(t,
 		retryTrue(20, 200*time.Millisecond, func() bool {
-			return node1.state.Term == node3.state.Term && node1.state.Index == node3.state.Index
+			return node1.state.Index == node3.state.Index
 		}), "WAL not in sync")
 
 	// stop the follower
@@ -530,7 +530,7 @@ func TestRestoreOldNodeFromChangedLeader(t *testing.T) {
 	// wait for WAL replication
 	require.Truef(t,
 		retryTrue(20, 200*time.Millisecond, func() bool {
-			return node1.state.Term == node3.state.Term && node1.state.Index == node3.state.Index
+			return node1.state.Index == node3.state.Index
 		}), "WAL not in sync")
 
 	// take a snapshot to inspect its values