Merge pull request #9558 from gyuho/propose

etcdserver: handle raft Propose error in v2 applier
etcd-io · Apr 10, 2018 · e9aa8fb · e9aa8fb
2 parents 943962d + b38e138
commit e9aa8fb
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/etcdserver/v2_server.go b/etcdserver/v2_server.go
@@ -101,7 +101,12 @@ func (a *reqV2HandlerEtcdServer) processRaftRequest(ctx context.Context, r *Requ
 	ch := a.s.w.Register(r.ID)
 
 	start := time.Now()
-	a.s.r.Propose(ctx, data)
+	err = a.s.r.Propose(ctx, data)
+	if err != nil {
+		proposalsFailed.Inc()
+		a.s.w.Trigger(r.ID, nil)
+		return Response{}, err
+	}
 	proposalsPending.Inc()
 	defer proposalsPending.Dec()