Ensure workers terminated fully before reading unknownRefs

pull/5805/head
Fabian Reinartz 7 years ago
parent 6e94145515
commit 106eaf39d1

@ -233,16 +233,20 @@ func (h *Head) ReadWAL() error {
// They are connected through a ring of channels which ensures that all sample batches // They are connected through a ring of channels which ensures that all sample batches
// read from the WAL are processed in order. // read from the WAL are processed in order.
var ( var (
wg sync.WaitGroup
n = runtime.GOMAXPROCS(0) n = runtime.GOMAXPROCS(0)
firstInput = make(chan []RefSample, 300) firstInput = make(chan []RefSample, 300)
input = firstInput input = firstInput
) )
wg.Add(n)
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
output := make(chan []RefSample, 300) output := make(chan []RefSample, 300)
go func(i int, input <-chan []RefSample, output chan<- []RefSample) { go func(i int, input <-chan []RefSample, output chan<- []RefSample) {
unknown := h.processWALSamples(mint, uint64(i), uint64(n), input, output) unknown := h.processWALSamples(mint, uint64(i), uint64(n), input, output)
atomic.AddUint64(&unknownRefs, unknown) atomic.AddUint64(&unknownRefs, unknown)
wg.Done()
}(i, input, output) }(i, input, output)
// The output feeds the next worker goroutine. For the last worker, // The output feeds the next worker goroutine. For the last worker,
@ -288,6 +292,8 @@ func (h *Head) ReadWAL() error {
close(firstInput) close(firstInput)
for range input { for range input {
} }
wg.Wait()
if err != nil { if err != nil {
return errors.Wrap(err, "consume WAL") return errors.Wrap(err, "consume WAL")
} }

Loading…
Cancel
Save