status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not block on reassertLeader during shutdown

This commit is contained in:
Frank Schroeder 2017-05-04 16:48:54 +02:00
parent cfd584a784
commit b33c4a16c1
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
consul/snapshot_endpoint.go
View File

@ -101,9 +101,14 @@ func (s *Server) dispatchSnapshotRequest(args *structs.SnapshotRequest, in io.Re
return nil, err return nil, err
} }
select {
// Tell the leader loop to reassert leader actions since we just // Tell the leader loop to reassert leader actions since we just
// replaced the state store contents. // replaced the state store contents.
s.reassertLeaderCh <- struct{}{} case s.reassertLeaderCh <- struct{}{}:
// Make sure we don't get stuck during shutdown
case <-s.shutdownCh:
}
// Give the caller back an empty reader since there's nothing to // Give the caller back an empty reader since there's nothing to
// stream back. // stream back.