query/endpointset: fix some races #5972
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 races around reading `e.endpoints`. Example race:
```
==================
WARNING: DATA RACE
Write at 0x00c00006a668 by main goroutine:
github.com/thanos-io/thanos/pkg/query.(*EndpointSet).Close()
/home/giedrius/dev/thanos/pkg/query/endpointset.go:582 +0x164
main.runQuery.func3()
/home/giedrius/dev/thanos/cmd/thanos/query.go:534 +0x44
github.com/oklog/run.(*Group).Run()
/home/giedrius/go/pkg/mod/github.com/oklog/[email protected]/group.go:47 +0x1ce
main.main()
/home/giedrius/dev/thanos/cmd/thanos/main.go:159 +0x2669
Previous read at 0x00c00006a668 by goroutine 276:
github.com/thanos-io/thanos/pkg/query.(*EndpointSet).Update()
/home/giedrius/dev/thanos/pkg/query/endpointset.go:396 +0xb9d
main.runQuery.func2.1()
/home/giedrius/dev/thanos/cmd/thanos/query.go:529 +0x4c
github.com/thanos-io/thanos/pkg/runutil.Repeat()
/home/giedrius/dev/thanos/pkg/runutil/runutil.go:74 +0xd8
main.runQuery.func2()
/home/giedrius/dev/thanos/cmd/thanos/query.go:528 +0x99
github.com/oklog/run.(*Group).Run.func1()
/home/giedrius/go/pkg/mod/github.com/oklog/[email protected]/group.go:38 +0x41
github.com/oklog/run.(*Group).Run.func2()
/home/giedrius/go/pkg/mod/github.com/oklog/[email protected]/group.go:39 +0x58
Goroutine 276 (running) created at:
github.com/oklog/run.(*Group).Run()
/home/giedrius/go/pkg/mod/github.com/oklog/[email protected]/group.go:37 +0x349
main.main()
/home/giedrius/dev/thanos/cmd/thanos/main.go:159 +0x2669
==================
```
Signed-off-by: Giedrius Statkevičius <[email protected]>
ngraham20
pushed a commit
to ngraham20/thanos
that referenced
this pull request
May 18, 2023
Fix races around reading `e.endpoints`. Example race:
```
==================
WARNING: DATA RACE
Write at 0x00c00006a668 by main goroutine:
github.com/thanos-io/thanos/pkg/query.(*EndpointSet).Close()
/home/giedrius/dev/thanos/pkg/query/endpointset.go:582 +0x164
main.runQuery.func3()
/home/giedrius/dev/thanos/cmd/thanos/query.go:534 +0x44
github.com/oklog/run.(*Group).Run()
/home/giedrius/go/pkg/mod/github.com/oklog/[email protected]/group.go:47 +0x1ce
main.main()
/home/giedrius/dev/thanos/cmd/thanos/main.go:159 +0x2669
Previous read at 0x00c00006a668 by goroutine 276:
github.com/thanos-io/thanos/pkg/query.(*EndpointSet).Update()
/home/giedrius/dev/thanos/pkg/query/endpointset.go:396 +0xb9d
main.runQuery.func2.1()
/home/giedrius/dev/thanos/cmd/thanos/query.go:529 +0x4c
github.com/thanos-io/thanos/pkg/runutil.Repeat()
/home/giedrius/dev/thanos/pkg/runutil/runutil.go:74 +0xd8
main.runQuery.func2()
/home/giedrius/dev/thanos/cmd/thanos/query.go:528 +0x99
github.com/oklog/run.(*Group).Run.func1()
/home/giedrius/go/pkg/mod/github.com/oklog/[email protected]/group.go:38 +0x41
github.com/oklog/run.(*Group).Run.func2()
/home/giedrius/go/pkg/mod/github.com/oklog/[email protected]/group.go:39 +0x58
Goroutine 276 (running) created at:
github.com/oklog/run.(*Group).Run()
/home/giedrius/go/pkg/mod/github.com/oklog/[email protected]/group.go:37 +0x349
main.main()
/home/giedrius/dev/thanos/cmd/thanos/main.go:159 +0x2669
==================
```
Signed-off-by: Giedrius Statkevičius <[email protected]>
Signed-off-by: Giedrius Statkevičius <[email protected]>
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 races around reading
e.endpoints. Example race:Cannot reproduce the race after these changes.