raft: do not load empty state and ents

release-2.0
Xiang Li 2014-11-03 15:16:41 -08:00
parent ff1f5a9d57
commit dbdeceda7b
1 changed files with 6 additions and 2 deletions

View File

@ -168,8 +168,12 @@ func RestartNode(id uint64, election, heartbeat int, snapshot *pb.Snapshot, st p
if snapshot != nil {
r.restore(*snapshot)
}
r.loadState(st)
r.loadEnts(ents)
if !isHardStateEqual(st, emptyState) {
r.loadState(st)
}
if len(ents) != 0 {
r.loadEnts(ents)
}
go n.run(r)
return &n
}