Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5293 from heyitsanthony/fix-compact-cancel-crash

Browse Source 
etcdserver: fix nil dereference in physical Compact on proposal timeout
This commit is contained in:
Gyu-Ho Lee 2016-05-06 16:25:03 -07:00
commit c9c2cdfeaf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/v3_server.go
View File

@ -121,7 +121,7 @@ func isTxnSerializable(r *pb.TxnRequest) bool {
func (s *EtcdServer) Compact(ctx context.Context, r *pb.CompactionRequest) (*pb.CompactionResponse, error) {
result, err := s.processInternalRaftRequest(ctx, pb.InternalRaftRequest{Compaction: r})
if r.Physical && result.physc != nil {
if r.Physical && result != nil && result.physc != nil {
<-result.physc
// The compaction is done deleting keys; the hash is now settled
// but the data is not necessarily committed. If there's a crash,