Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

store: Setting the start and end to prior posting changes #837

Merged
merged 7 commits into from
Feb 13, 2019
Merged

store: Setting the start and end to prior posting changes #837

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81bcf5f
setting the start and end to prior posting changes
domgreen Feb 12, 2019
0fd1e8e
really need some tests data but this may also be the fix
domgreen Feb 12, 2019
4091db5
moving the start and end inside the loop, so they are not updated as …
domgreen Feb 12, 2019
9c31327
Added regressions tests for #829.
bwplotka Feb 13, 2019
e96fce4
Fixed overestimation for fetching chunks and series.
bwplotka Feb 13, 2019
967b597
Removed wrong comment.
bwplotka Feb 13, 2019
8b10db0
changing func to match interface
domgreen Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkg/store/bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,10 +1366,11 @@ func (r *bucketIndexReader) PreloadSeries(ids []uint64) error {

for _, p := range parts {
ctx, cancel := context.WithCancel(r.ctx)
s, e := p.start, p.end
i, j := p.elemRng[0], p.elemRng[1]

g.Add(func() error {
return r.loadSeries(ctx, ids[i:j], p.start, p.end+maxSeriesSize)
return r.loadSeries(ctx, ids[i:j], s, e+maxSeriesSize)
}, func(err error) {
if err != nil {
cancel()
Expand Down Expand Up @@ -1538,10 +1539,11 @@ func (r *bucketChunkReader) preload() error {

for _, p := range parts {
ctx, cancel := context.WithCancel(r.ctx)
s, e := uint32(p.start), uint32(p.end)
m, n := p.elemRng[0], p.elemRng[1]

g.Add(func() error {
return r.loadChunks(ctx, offsets[m:n], seq, uint32(p.start), uint32(p.end)+maxChunkSize)
return r.loadChunks(ctx, offsets[m:n], seq, s, e+maxChunkSize)
}, func(err error) {
if err != nil {
cancel()
Expand All @@ -1559,11 +1561,11 @@ func (r *bucketChunkReader) loadChunks(ctx context.Context, offs []uint32, seq i
if err != nil {
return errors.Wrapf(err, "read range for %d", seq)
}
r.chunkBytes = append(r.chunkBytes, b)

r.mtx.Lock()
defer r.mtx.Unlock()

r.chunkBytes = append(r.chunkBytes, b)
r.stats.chunksFetchCount++
r.stats.chunksFetched += len(offs)
r.stats.chunksFetchDurationSum += time.Since(begin)
Expand Down