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

Merge pull request #13391 from GiedriusS/compact_merge_func 

tsdb/compact: fix passing merge func
This commit is contained in:
Ben Kochie 2024-01-15 09:43:06 +01:00 committed by GitHub
parent 4fbd406a36 9b759135d1
commit 17920623e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tsdb/compact.go
View File

@ -184,8 +184,8 @@ func NewLeveledCompactorWithOptions(ctx context.Context, r prometheus.Registerer
if l == nil {
l = log.NewNopLogger()
}
var mergeFunc storage.VerticalChunkSeriesMergeFunc
if opts.MergeFunc == nil {
mergeFunc := opts.MergeFunc
if mergeFunc == nil {
mergeFunc = storage.NewCompactingChunkSeriesMerger(storage.ChainedSeriesMerge)
}
var maxBlockChunkSegmentSize int64