RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #176 from prometheus/races 

Races
This commit is contained in:
Fabian Reinartz 2017-10-12 15:27:08 +02:00 committed by GitHub
parent efe9509d04 88305e7612
commit 7f8fa07cf7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
head.go
View File

@ -239,16 +239,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,
@ -294,6 +298,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")
} }
@ -756,10 +762,11 @@ func (h *headChunkReader) Chunk(ref uint64) (chunks.Chunk, error) {
s.Lock() s.Lock()
c := s.chunk(int(cid)) c := s.chunk(int(cid))
mint, maxt := c.minTime, c.maxTime
s.Unlock() s.Unlock()
// Do not expose chunks that are outside of the specified range. // Do not expose chunks that are outside of the specified range.
if c == nil || !intervalOverlap(c.minTime, c.maxTime, h.mint, h.maxt) { if c == nil || !intervalOverlap(mint, maxt, h.mint, h.maxt) {
return nil, ErrNotFound return nil, ErrNotFound
} }
return &safeChunk{ return &safeChunk{