server: v2 propose sends error back

2014-07-13 16:29:03 -07:00 · 2014-07-13 16:29:03 -07:00 · 5562c3b4ec
parent 5af8fe9a84
commit 5562c3b4ec
1 changed files with 4 additions and 3 deletions
--- 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() {