api: fix race between Respond() and query/queryRange #5583
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix a data race between Respond() and query/queryRange functions by
returning an extra optional function from instrumented functions that
releases the resources i.e. calls Close().
Cannot reproduce the following race:
```
==================
WARNING: DATA RACE
Write at 0x00c00566fa00 by goroutine 562:
github.com/prometheus/prometheus/promql.(*evaluator).eval()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:1450 +0x8044
github.com/prometheus/prometheus/promql.(*evaluator).rangeEval()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:1060 +0x2684
github.com/prometheus/prometheus/promql.(*evaluator).eval()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:1281 +0x42a4
github.com/prometheus/prometheus/promql.(*evaluator).rangeEval()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:1060 +0x2684
github.com/prometheus/prometheus/promql.(*evaluator).eval()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:1281 +0x42a4
github.com/prometheus/prometheus/promql.(*evaluator).Eval()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:989 +0xf5
github.com/prometheus/prometheus/promql.(*Engine).execEvalStmt()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:645 +0xa77
github.com/prometheus/prometheus/promql.(*Engine).exec()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:595 +0x71e
github.com/prometheus/prometheus/promql.(*query).Exec()
/home/giedrius/go/pkg/mod/github.com/vinted/prometheus@v1.8.2-0.20220808145920-5c879a061105/promql/engine.go:197 +0x250
github.com/thanos-io/thanos/pkg/api/query.(*QueryAPI).query()
/home/giedrius/dev/thanos/pkg/api/query/v1.go:387 +0xbf2
github.com/thanos-io/thanos/pkg/api/query.(*QueryAPI).query-fm()
...
Previous read at 0x00c00566fa00 by goroutine 570:
github.com/prometheus/prometheus/promql.(*Point).MarshalJSON()
<autogenerated>:1 +0x4e
encoding/json.addrMarshalerEncoder()
/usr/lib/go-1.19/src/encoding/json/encode.go:495 +0x1af
encoding/json.condAddrEncoder.encode()
/usr/lib/go-1.19/src/encoding/json/encode.go:959 +0x94
encoding/json.condAddrEncoder.encode-fm()
<autogenerated>:1 +0xa4
encoding/json.arrayEncoder.encode()
/usr/lib/go-1.19/src/encoding/json/encode.go:915 +0x10e
encoding/json.arrayEncoder.encode-fm()
<autogenerated>:1 +0x90
encoding/json.sliceEncoder.encode()
```
Should fix thanos-io#5501.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
niaurys
approved these changes
Aug 10, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix a data race between Respond() and query/queryRange functions by
returning an extra optional function from instrumented functions that
releases the resources i.e. calls Close().
Cannot reproduce the following race:
Should fix #5501.
Signed-off-by: Giedrius Statkevičius giedrius.statkevicius@vinted.com