receive: Fixed small options race; Removed unused StartTime feature. #2816
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
startTimeMargin and StartTime is used only by Prometheus remote read, Thanos does not use it.
Fixed following race:
```
=== RUN TestMultiTSDB/run_on_existing_storage
==================
WARNING: DATA RACE
Read at 0x00c00073ae80 by goroutine 69:
github.com/prometheus/prometheus/tsdb.validateOpts()
/home/bwplotka/Repos/thanosgopath/pkg/mod/github.com/prometheus/prometheus@v1.8.2-0.20200609165731-66dfb951c4ca/tsdb/db.go:510 +0x55
github.com/prometheus/prometheus/tsdb.Open()
/home/bwplotka/Repos/thanosgopath/pkg/mod/github.com/prometheus/prometheus@v1.8.2-0.20200609165731-66dfb951c4ca/tsdb/db.go:502 +0x61
github.com/thanos-io/thanos/pkg/receive.(*MultiTSDB).getOrLoadTenant.func1()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb.go:268 +0x56b
github.com/thanos-io/thanos/pkg/receive.(*MultiTSDB).getOrLoadTenant()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb.go:302 +0x4ef
github.com/thanos-io/thanos/pkg/receive.(*MultiTSDB).Open.func1()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb.go:142 +0x66
golang.org/x/sync/errgroup.(*Group).Go.func1()
/home/bwplotka/Repos/thanosgopath/pkg/mod/golang.org/x/sync@v0.0.0-20200317015054-43a5402ce75a/errgroup/errgroup.go:57 +0x85
Previous write at 0x00c00073ae80 by goroutine 57:
github.com/prometheus/prometheus/tsdb.validateOpts()
/home/bwplotka/Repos/thanosgopath/pkg/mod/github.com/prometheus/prometheus@v1.8.2-0.20200609165731-66dfb951c4ca/tsdb/db.go:511 +0x1f2
github.com/prometheus/prometheus/tsdb.Open()
/home/bwplotka/Repos/thanosgopath/pkg/mod/github.com/prometheus/prometheus@v1.8.2-0.20200609165731-66dfb951c4ca/tsdb/db.go:502 +0x61
github.com/thanos-io/thanos/pkg/receive.(*MultiTSDB).getOrLoadTenant.func1()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb.go:268 +0x56b
github.com/thanos-io/thanos/pkg/receive.(*MultiTSDB).getOrLoadTenant()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb.go:302 +0x4ef
github.com/thanos-io/thanos/pkg/receive.(*MultiTSDB).Open.func1()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb.go:142 +0x66
golang.org/x/sync/errgroup.(*Group).Go.func1()
/home/bwplotka/Repos/thanosgopath/pkg/mod/golang.org/x/sync@v0.0.0-20200317015054-43a5402ce75a/errgroup/errgroup.go:57 +0x85
Goroutine 69 (running) created at:
golang.org/x/sync/errgroup.(*Group).Go()
/home/bwplotka/Repos/thanosgopath/pkg/mod/golang.org/x/sync@v0.0.0-20200317015054-43a5402ce75a/errgroup/errgroup.go:54 +0x73
github.com/thanos-io/thanos/pkg/receive.(*MultiTSDB).Open()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb.go:141 +0x2af
github.com/thanos-io/thanos/pkg/receive.TestMultiTSDB.func3()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb_test.go:118 +0x6d3
testing.tRunner()
/home/bwplotka/.gvm/gos/go1.14.2/src/testing/testing.go:991 +0x1eb
Goroutine 57 (running) created at:
golang.org/x/sync/errgroup.(*Group).Go()
/home/bwplotka/Repos/thanosgopath/pkg/mod/golang.org/x/sync@v0.0.0-20200317015054-43a5402ce75a/errgroup/errgroup.go:54 +0x73
github.com/thanos-io/thanos/pkg/receive.(*MultiTSDB).Open()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb.go:141 +0x2af
github.com/thanos-io/thanos/pkg/receive.TestMultiTSDB.func3()
/home/bwplotka/Repos/thanos/pkg/receive/multitsdb_test.go:118 +0x6d3
testing.tRunner()
/home/bwplotka/.gvm/gos/go1.14.2/src/testing/testing.go:991 +0x1eb
==================
```
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
bwplotka
force-pushed
the
receive-blocked
branch
from
ec9652e
to
4c2a9b5
Compare
brancz
approved these changes
Jun 29, 2020
squat
approved these changes
Jun 29, 2020
paulfantom
added a commit
to paulfantom/thanos
that referenced
this pull request
Jul 9, 2020
* upstream/release-0.14: (46 commits) Cut release v0.14.0-rc.1 (thanos-io#2853) Query: correctly marshal errors to JSON and ignore if nil (thanos-io#2848) ci: Manually download promu in crossbuild stage (thanos-io#2828) Cut release v0.14.0-rc.0 (thanos-io#2826) Soft cut changelog on master to indicate v0.14.0 being in progress (thanos-io#2824) Update ThanosReceiveNoUpload to select sum == 0 (thanos-io#2819) receive: Added more observability, fixed leaktest, to actually check leaks ): (thanos-io#2817) Query: always return a string in the `lastError` field (thanos-io#2809) Added missing CHANGELOG entry for PR 2613 (thanos-io#2820) receive: Fixed small options race; Removed unused StartTime feature. (thanos-io#2816) go.mod: Bump Prometheus to current latest (thanos-io#2814) Implement CLI Flags page in React UI (thanos-io#2796) Improve ThanosReceiveNoUpload to only alert on current instances store: Preallocate output buffer when encoding postings. (thanos-io#2812) compact: introduce flag --block-viewer.global.sync-block-interval (thanos-io#2752) docs: compact: add blurb about how retention policy works (thanos-io#2808) Reduced memory allocations in readIndexRange() (thanos-io#2807) ui: Add Stores page to React UI (thanos-io#2754) Added Kemal to Maintainer Role; Kemal is volounteering to be next release shephard (thanos-io#2804) proposal: Add scalable rule storage proposal (thanos-io#2661) ...
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.
NOTE: Those are minor fixes, this does not fix any issue we see with CPU usage or cut block.
Signed-off-by: Bartlomiej Plotka bwplotka@gmail.com
Changes
Verification