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.

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

BatchIter edge cases #2466

Merged
merged 9 commits into from
Aug 5, 2020
Merged

BatchIter edge cases #2466

merged 9 commits into from
Aug 5, 2020

Conversation

owen-d
Copy link
Member

@owen-d owen-d commented Aug 4, 2020

This fixes a few issues in the batch iterator code, including:

  1. Ensure calls to MemChunk.Blocks are inclusive. This is particularly helpful when they contain a single entry which has been requested in the batching code. At this point it's unknown whether the call is looking for [start,end) or (start,end], dependent on logproto.Direction. This is handled at a higher layer via the TimeBoundedIter, so we should handle these requests inclusively for now. I found it stripping logs when start=end was requested.

  2. Only include previously overlapping chunks one time per batch. In rare cases, it could previously add these repeatedly on a loop, effectively duplicating references to the same chunks within a single batch.

  3. Fixes sample iterator from deleting a regular iterator in the memchunk cache map.

  4. Fixes metric name in a test utility.

  5. Thanks to the wondrous @rfratto for spotting the embedded field race condition.

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rfratto !!!! LGTM!

@codecov-commenter
Copy link

Codecov Report

Merging #2466 into master will increase coverage by 0.05%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2466      +/-   ##
==========================================
+ Coverage   62.80%   62.86%   +0.05%     
==========================================
  Files         162      162              
  Lines       13966    13975       +9     
==========================================
+ Hits         8772     8786      +14     
+ Misses       4512     4506       -6     
- Partials      682      683       +1     
Impacted Files Coverage Δ
pkg/chunkenc/memchunk.go 75.41% <100.00%> (+2.12%) ⬆️
pkg/storage/batch.go 83.95% <100.00%> (+0.45%) ⬆️
pkg/storage/lazy_chunk.go 94.17% <100.00%> (-1.95%) ⬇️
pkg/querier/queryrange/downstreamer.go 95.87% <0.00%> (-2.07%) ⬇️
pkg/logql/evaluator.go 92.47% <0.00%> (-0.41%) ⬇️
pkg/promtail/targets/file/tailer.go 78.40% <0.00%> (+2.27%) ⬆️

@owen-d owen-d merged commit cb20afa into grafana:master Aug 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants