etcdserver: handle proposal error when processing internal raft request

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
etcd-io · Apr 9, 2018 · 3c52342 · 3c52342
1 parent 89c58b6
commit 3c52342
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go
@@ -582,7 +582,12 @@ func (s *EtcdServer) processInternalRaftRequestOnce(ctx context.Context, r pb.In
 	defer cancel()
 
 	start := time.Now()
-	s.r.Propose(cctx, data)
+	err = s.r.Propose(cctx, data)
+	if err != nil {
+		proposalsFailed.Inc()
+		s.w.Trigger(id, nil) // GC wait
+		return nil, err
+	}
 	proposalsPending.Inc()
 	defer proposalsPending.Dec()