Просмотр исходного кода

Merge pull request #2878 from xiang90/fix_raft_node

raft: fix raft node start bug
Xiang Li 10 лет назад
Родитель
Сommit
4e97305df0
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      raft/node.go
  2. 2 2
      raft/node_test.go

+ 1 - 1
raft/node.go

@@ -243,7 +243,7 @@ func (n *node) run(r *raft) {
 
 	lead := None
 	prevSoftSt := r.softState()
-	prevHardSt := r.HardState
+	prevHardSt := emptyState
 
 	for {
 		if advancec != nil {

+ 2 - 2
raft/node_test.go

@@ -362,7 +362,7 @@ func TestNodeRestart(t *testing.T) {
 	st := raftpb.HardState{Term: 1, Commit: 1}
 
 	want := Ready{
-		HardState: emptyState,
+		HardState: st,
 		// commit up to index commit index in st
 		CommittedEntries: entries[:st.Commit],
 	}
@@ -405,7 +405,7 @@ func TestNodeRestartFromSnapshot(t *testing.T) {
 	st := raftpb.HardState{Term: 1, Commit: 3}
 
 	want := Ready{
-		HardState: emptyState,
+		HardState: st,
 		// commit up to index commit index in st
 		CommittedEntries: entries,
 	}