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

Merge pull request #1293 from unihorn/160

Browse Source 
raft: protobuf messageType
This commit is contained in:
Xiang Li
2014-10-14 09:16:38 +08:00
parent 9722aac10d 32c38820c1
commit d7dfe07e5d
6 changed files with 211 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
raft/node.go
View File

@@ -269,16 +269,16 @@ func (n *node) Tick() {
}
func (n *node) Campaign(ctx context.Context) error {
return n.step(ctx, pb.Message{Type: msgHup})
return n.step(ctx, pb.Message{Type: pb.MsgHup})
}
func (n *node) Propose(ctx context.Context, data []byte) error {
return n.step(ctx, pb.Message{Type: msgProp, Entries: []pb.Entry{{Data: data}}})
return n.step(ctx, pb.Message{Type: pb.MsgProp, Entries: []pb.Entry{{Data: data}}})
}
func (n *node) Step(ctx context.Context, m pb.Message) error {
// ignore unexpected local messages receiving over network
if m.Type == msgHup || m.Type == msgBeat {
if m.Type == pb.MsgHup || m.Type == pb.MsgBeat {
// TODO: return an error?
return nil
}
@@ -290,14 +290,14 @@ func (n *node) ProposeConfChange(ctx context.Context, cc pb.ConfChange) error {
if err != nil {
return err
}
return n.Step(ctx, pb.Message{Type: msgProp, Entries: []pb.Entry{{Type: pb.EntryConfChange, Data: data}}})
return n.Step(ctx, pb.Message{Type: pb.MsgProp, Entries: []pb.Entry{{Type: pb.EntryConfChange, Data: data}}})
}
// Step advances the state machine using msgs. The ctx.Err() will be returned,
// if any.
func (n *node) step(ctx context.Context, m pb.Message) error {
ch := n.recvc
if m.Type == msgProp {
if m.Type == pb.MsgProp {
ch = n.propc
}