Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

update the confstate before sending snapshot

Browse Source 
When there is a `raftpb.EntryConfChange` after creating the snapshot,
then the confState included in the snapshot is out of date. so We need
to update the confState before sending a snapshot to a follower.
This commit is contained in:
ahrtr 2022-03-07 09:47:37 +08:00
parent 8ac44ffa5f
commit 793218ed2b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/raftexample/raft.go
View File

@ -456,7 +456,7 @@ func (rc *raftNode) serveChannels() {
rc.publishSnapshot(rd.Snapshot) rc.publishSnapshot(rd.Snapshot)
} }
rc.raftStorage.Append(rd.Entries) rc.raftStorage.Append(rd.Entries)
rc.transport.Send(rd.Messages) rc.transport.Send(rc.processMessages(rd.Messages))
applyDoneC, ok := rc.publishEntries(rc.entriesToApply(rd.CommittedEntries)) applyDoneC, ok := rc.publishEntries(rc.entriesToApply(rd.CommittedEntries))
if !ok { if !ok {
rc.stop() rc.stop()
@ -476,6 +476,18 @@ func (rc *raftNode) serveChannels() {
} }
} }
// When there is a `raftpb.EntryConfChange` after creating the snapshot,
// then the confState included in the snapshot is out of date. so We need
// to update the confState before sending a snapshot to a follower.
func (rc *raftNode) processMessages(ms []raftpb.Message) []raftpb.Message {
for i := 0; i < len(ms); i++ {
if ms[i].Type == raftpb.MsgSnap {
ms[i].Snapshot.Metadata.ConfState = rc.confState
}
}
return ms
}
func (rc *raftNode) serveRaft() { func (rc *raftNode) serveRaft() {
url, err := url.Parse(rc.peers[rc.id-1]) url, err := url.Parse(rc.peers[rc.id-1])
if err != nil { if err != nil {