try etcd-io/etcd#13760

Signed-off-by: CrazyMax <[email protected]>

manager/state/raft/raft.go

@@ -606,7 +606,7 @@ func (n *Node) Run(ctx context.Context) error {
 				}
 			}
 
-			for _, msg := range rd.Messages {
+			for _, msg := range n.processMessages(rd.Messages) {
 				// Send raft messages to peers
 				if err := n.transport.Send(msg); err != nil {
 					log.G(ctx).WithError(err).Error("failed to send message to member")
@@ -741,6 +741,18 @@ func (n *Node) Run(ctx context.Context) error {
 	}
 }
 
+// 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 (n *Node) processMessages(ms []raftpb.Message) []raftpb.Message {
+	for i := 0; i < len(ms); i++ {
+		if ms[i].Type == raftpb.MsgSnap {
+			ms[i].Snapshot.Metadata.ConfState = n.confState
+		}
+	}
+	return ms
+}
+
 func (n *Node) restoreFromSnapshot(ctx context.Context, data []byte) error {
 	snapCluster, err := n.clusterSnapshot(data)
 	if err != nil {