From df259e5878e087d5230a81970c12104c6f5ef194 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 8 Sep 2014 21:50:04 -0700 Subject: [PATCH] raft: add a newReady helper function --- raft/node.go | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/raft/node.go b/raft/node.go index 9ebf19bd3..c48e955ee 100644 --- a/raft/node.go +++ b/raft/node.go @@ -103,18 +103,7 @@ func (n *Node) run(r *raft) { } } - rd := Ready{ - Entries: r.raftLog.unstableEnts(), - CommittedEntries: r.raftLog.nextEnts(), - Messages: r.msgs, - } - - if isStateEqual(r.State, prevSt) { - rd.State = emptyState - } else { - rd.State = r.State - } - + rd := newReady(r, prevSt) if rd.containsUpdates() { readyc = n.readyc } else { @@ -182,3 +171,18 @@ func (n *Node) Step(ctx context.Context, m pb.Message) error { func (n *Node) Ready() <-chan Ready { return n.readyc } + +func newReady(r *raft, prev pb.State) Ready { + rd := Ready{ + Entries: r.raftLog.unstableEnts(), + CommittedEntries: r.raftLog.nextEnts(), + Messages: r.msgs, + } + + if isStateEqual(r.State, prev) { + rd.State = emptyState + } else { + rd.State = r.State + } + return rd +}