Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
extkingpin: fix Content/Rewrite race (thanos-io#6870)
Got this during `TestLimiter_StartConfigReloader`: ``` Read at 0x00c0005123f0 by goroutine 8711: github.com/thanos-io/thanos/pkg/extkingpin.(*staticPathContent).Content() /home/giedrius/dev/thanos/pkg/extkingpin/path_content_reloader.go:90 +0x28 github.com/thanos-io/thanos/pkg/receive.ParseLimitConfigContent() /home/giedrius/dev/thanos/pkg/receive/limiter.go:203 +0x3e github.com/thanos-io/thanos/pkg/receive.(*Limiter).loadConfig() /home/giedrius/dev/thanos/pkg/receive/limiter.go:143 +0x65 github.com/thanos-io/thanos/pkg/receive.(*Limiter).StartConfigReloader.func1() /home/giedrius/dev/thanos/pkg/receive/limiter.go:119 +0x207 github.com/thanos-io/thanos/pkg/extkingpin.(*pollingEngine).start.func1() /home/giedrius/dev/thanos/pkg/extkingpin/path_content_reloader.go:64 +0x6b8 github.com/thanos-io/thanos/pkg/extkingpin.(*pollingEngine).start.func2() /home/giedrius/dev/thanos/pkg/extkingpin/path_content_reloader.go:74 +0x56 Previous write at 0x00c0005123f0 by goroutine 8710: github.com/thanos-io/thanos/pkg/extkingpin.(*staticPathContent).Rewrite() /home/giedrius/dev/thanos/pkg/extkingpin/path_content_reloader.go:111 +0x529 github.com/thanos-io/thanos/pkg/receive.TestLimiter_StartConfigReloader() /home/giedrius/dev/thanos/pkg/receive/limiter_test.go:44 +0x5aa testing.tRunner() /usr/lib/go-1.21/src/testing/testing.go:1595 +0x238 testing.(*T).Run.func1() /usr/lib/go-1.21/src/testing/testing.go:1648 +0x44 ``` Fix it by protecting `t.content` with a mutex and by copying the content's slice so that the caller wouldn't have access to the original slice. Signed-off-by: Giedrius Statkevičius <[email protected]>
- Loading branch information