scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-06 10:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

close disco before holder

Browse source
This commit is contained in:
Kuba Podgórski 2021-01-14 17:35:30 +01:00
parent 2713be9329
commit 0e4a7a29fb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server.go
View file

@ -684,10 +684,13 @@ func (s *Server) Close() error {
// Notify goroutines to stop.
close(s.closing)
s.wg.Wait()
var errh, errd error
var errhs error
var errc error
if s.disCo != nil {
errd = s.disCo.Close()
}
if s.cluster != nil {
errc = s.cluster.close()
}
@ -701,9 +704,6 @@ func (s *Server) Close() error {
s.snapshotQueue = nil
}
if s.disCo != nil {
errd = s.disCo.Close()
}
// prefer to return holder error over cluster
// error. This order is somewhat arbitrary. It would be better if we had
// some way to combine all the errors, but probably not important enough to