From 06ea8aee115b04d0b4419b90a277c76ab051b320 Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Wed, 27 Apr 2016 16:28:40 -0700
Subject: [PATCH] v3rpc: only fill lease grant header if no error

Was panicking under cluster fault injection.
---
 etcdserver/api/v3rpc/lease.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etcdserver/api/v3rpc/lease.go b/etcdserver/api/v3rpc/lease.go
index 26ca80ea6..8553cfffb 100644
--- a/etcdserver/api/v3rpc/lease.go
+++ b/etcdserver/api/v3rpc/lease.go
@@ -38,6 +38,9 @@ func (ls *LeaseServer) LeaseGrant(ctx context.Context, cr *pb.LeaseGrantRequest)
 	if err == lease.ErrLeaseExists {
 		return nil, rpctypes.ErrLeaseExist
 	}
+	if err != nil {
+		return nil, err
+	}
 	ls.hdr.fill(resp.Header)
 	return resp, err
 }