etcdserver: handle proposal error when processing internal raft request

etcd-io · Apr 9, 2018 · b1d7eb7 · b1d7eb7
1 parent a8a5176
commit b1d7eb7
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 failed
+		return nil, err
+	}
 	proposalsPending.Inc()
 	defer proposalsPending.Dec()