Fix archive storage not querying old spans older than maxSpanAge #1617
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
Signed-off-by: Pavol Loffay <[email protected]>
Signed-off-by: Pavol Loffay <[email protected]>
pavolloffay
requested review from
black-adder,
jpkrohling,
objectiser,
tiffon,
vprithvi and
yurishkuro
as code owners
Signed-off-by: Pavol Loffay <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #1617 +/- ##
==========================================
+ Coverage 98.74% 98.74% +<.01%
==========================================
Files 191 191
Lines 9169 9170 +1
==========================================
+ Hits 9054 9055 +1
Misses 89 89
Partials 26 26
Continue to review full report at Codecov.
|
objectiser
approved these changes
Jun 21, 2019
| @@ -305,6 +321,7 @@ func (s *SpanReader) multiRead(ctx context.Context, traceIDs []model.TraceID, st | |||
| indices := s.timeRangeIndices(s.spanIndexPrefix, startTime.Add(-time.Hour), endTime.Add(time.Hour)) | |||
| nextTime := model.TimeAsEpochMicroseconds(startTime.Add(-time.Hour)) | |||
|
|
|||
| fmt.Println(indices) | |||
| TagDotReplacement: tagKeyDeDotChar, | ||
| Archive: archive, |
There was a problem hiding this comment.
nit: formatting looks wrong here
There was a problem hiding this comment.
The check passed fine
Signed-off-by: Pavol Loffay <[email protected]>
pavolloffay
commented
Jun 21, 2019
| TerminateAfter(maxNumSpans). | ||
| Sort("startTime", true) | ||
| if !archive { | ||
| s.SearchAfter(nextTime) |
There was a problem hiding this comment.
This query uses scroll API https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-search-after.html.
SearchAfter says to include results with startTime parameter after nextTime. In archive storage we want to include all results.
Signed-off-by: Pavol Loffay <[email protected]>
Signed-off-by: Pavol Loffay <[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.
Resolves #1511