Browse Source

Do not block on reassertLeader during shutdown

pull/3004/head
Frank Schroeder 8 years ago
parent
commit
b33c4a16c1
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
  1. 7
      consul/snapshot_endpoint.go

7
consul/snapshot_endpoint.go

@ -101,9 +101,14 @@ func (s *Server) dispatchSnapshotRequest(args *structs.SnapshotRequest, in io.Re
return nil, err
}
select {
// Tell the leader loop to reassert leader actions since we just
// 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
// stream back.

Loading…
Cancel
Save