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

raft: unblock progress by deproitizing proposals in Step

Browse Source
This commit is contained in:
Blake Mizerany 2014-08-25 12:30:44 -07:00 committed by Yicheng Qin
parent f87a6f3c1f
commit 481e229ad4
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
raft/node.go
View File

@ -1,7 +1,11 @@
// Package raft implements raft. // Package raft implements raft.
package raft package raft
import "code.google.com/p/go.net/context" import (
"sort"
"code.google.com/p/go.net/context"
)
type stateResp struct { type stateResp struct {
st State st State
@ -95,11 +99,15 @@ func (n *Node) Tick() error {
// Propose proposes data be appended to the log. // Propose proposes data be appended to the log.
func (n *Node) Propose(ctx context.Context, data []byte) error { func (n *Node) Propose(ctx context.Context, data []byte) error {
return n.Step(ctx, Message{Type: msgProp, Entries: []Entry{{Data: data}}}) return n.Step(ctx, []Message{{Type: msgProp, Entries: []Entry{{Data: data}}}})
} }
// Step advances the state machine using m. // Step advances the state machine using msgs. Proposals are priotized last so
func (n *Node) Step(ctx context.Context, m Message) error { // that any votes and vote requests will not be wedged behind proposals and
// prevent this cluster from making progress.
func (n *Node) Step(ctx context.Context, msgs []Message) error {
sort.Sort(sort.Reverse(messages(msgs)))
for _, m := range msgs {
ch := n.recvc ch := n.recvc
if m.Type == msgProp { if m.Type == msgProp {
ch = n.propc ch = n.propc
@ -114,6 +122,8 @@ func (n *Node) Step(ctx context.Context, m Message) error {
return n.ctx.Err() return n.ctx.Err()
} }
} }
return nil
}
// ReadState returns the current point-in-time state. // ReadState returns the current point-in-time state.
func (n *Node) ReadState(ctx context.Context) (st State, ents, cents []Entry, msgs []Message, err error) { func (n *Node) ReadState(ctx context.Context) (st State, ents, cents []Entry, msgs []Message, err error) {
@ -126,3 +136,9 @@ func (n *Node) ReadState(ctx context.Context) (st State, ents, cents []Entry, ms
return State{}, nil, nil, nil, n.ctx.Err() return State{}, nil, nil, nil, n.ctx.Err()
} }
} }
type messages []Message
func (msgs messages) Len() int { return len(msgs) }
func (msgs messages) Less(i, j int) bool { return msgs[i].Type == msgProp }
func (msgs messages) Swap(i, j int) { msgs[i], msgs[j] = msgs[i], msgs[j] }