mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 53 Packages Projects Releases Wiki Activity

Merge pull request #133 from grafana/fix-error-reported-by-asyncblockwriter

Browse source 
Fix error reported by asyncBlockWriter.addSeries()
This commit is contained in:
Marco Pracucci 2022-02-10 16:19:59 +01:00 committed by GitHub
parent cd86e92b74 f644c5867f
commit f8e3195f75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tsdb/async_block_writer.go
View file

@ -2,7 +2,6 @@ package tsdb
import (
"context"
"fmt"
"github.com/pkg/errors"
"go.uber.org/atomic"
@ -14,6 +13,8 @@ import (
"github.com/prometheus/prometheus/tsdb/chunks"
)
var errAsyncBlockWriterNotRunning = errors.New("asyncBlockWriter doesn't run anymore")
// asyncBlockWriter runs a background goroutine that writes series and chunks to the block asynchronously.
type asyncBlockWriter struct {
chunkPool chunkenc.Pool // Where to return chunks after writing.
@ -111,7 +112,14 @@ func (bw *asyncBlockWriter) addSeries(lbls labels.Labels, chks []chunks.Meta) er
if ok {
bw.result = result
}
return fmt.Errorf("asyncBlockWriter doesn't run anymore")
// If the writer isn't running anymore because of an error occurred in loop()
// then we should return that error too, otherwise it may be never reported
// and we'll never know the actual root cause.
if bw.result.err != nil {
return errors.Wrap(bw.result.err, errAsyncBlockWriterNotRunning.Error())
}
return errAsyncBlockWriterNotRunning
}
}