From 5562c3b4ecfd2fd8a7ddb4d46b47269bdde74339 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Sun, 13 Jul 2014 16:29:03 -0700 Subject: [PATCH] server: v2 propose sends error back --- etcd/v2_raft.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etcd/v2_raft.go b/etcd/v2_raft.go index b2958739e..863348f54 100644 --- a/etcd/v2_raft.go +++ b/etcd/v2_raft.go @@ -24,13 +24,14 @@ type v2Raft struct { term int64 } -func (r *v2Raft) Propose(p v2Proposal) error { +func (r *v2Raft) Propose(p v2Proposal) { if !r.Node.IsLeader() { - return fmt.Errorf("not leader") + p.ret <- fmt.Errorf("not leader") + return } r.Node.Propose(p.data) r.result[wait{r.Index(), r.Term()}] = p.ret - return nil + return } func (r *v2Raft) Sync() {