Fix error reported by asyncBlockWriter.addSeries()

Signed-off-by: Marco Pracucci <marco@pracucci.com>
This commit is contained in:
Marco Pracucci 2022-02-10 15:07:13 +01:00
parent cd86e92b74
commit 583e746a82
No known key found for this signature in database
GPG key ID: 74C1BD403D2DF9B5

View file

@ -2,7 +2,6 @@ package tsdb
import ( import (
"context" "context"
"fmt"
"github.com/pkg/errors" "github.com/pkg/errors"
"go.uber.org/atomic" "go.uber.org/atomic"
@ -14,6 +13,10 @@ import (
"github.com/prometheus/prometheus/tsdb/chunks" "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. // asyncBlockWriter runs a background goroutine that writes series and chunks to the block asynchronously.
type asyncBlockWriter struct { type asyncBlockWriter struct {
chunkPool chunkenc.Pool // Where to return chunks after writing. chunkPool chunkenc.Pool // Where to return chunks after writing.
@ -111,7 +114,14 @@ func (bw *asyncBlockWriter) addSeries(lbls labels.Labels, chks []chunks.Meta) er
if ok { if ok {
bw.result = result 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
} }
} }