fix index out of bound bug when comparing ZLabelSets #3520
Merged
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: Ben Ye <yb532204897@gmail.com>
Signed-off-by: Ben Ye <yb532204897@gmail.com>
yeya24
changed the title
|
Generally looking good. Some other pair of eyes would be good, as I'm not too familiar with this part. |
bwplotka
approved these changes
Dec 3, 2020
pkg/queryfrontend/labels_codec.go
Outdated
| i := 0 | ||
| var resp queryrange.Response | ||
| for _, response := range responses { | ||
| if len(response.(*ThanosSeriesResponse).Data) > 0 { |
There was a problem hiding this comment.
I don't get this, why we cannot check this in loop below?
There was a problem hiding this comment.
Makes sense. As you mentioned I ll remove this change since it is unrelated and I ll fix them in next pr against master
| @@ -111,7 +111,7 @@ func (c queryRangeCodec) DecodeRequest(_ context.Context, r *http.Request) (quer | |||
| result.ReplicaLabels = r.Form[queryv1.ReplicaLabelsParam] | |||
| } | |||
|
|
|||
| result.StoreMatchers, err = parseMatchersParam(r.Form[queryv1.StoreMatcherParam]) | |||
| result.StoreMatchers, err = parseMatchersParam(r.Form[queryv1.StoreMatcherParam], queryv1.StoreMatcherParam) | |||
There was a problem hiding this comment.
This is bad code smell - passing same information twice. Maybe we should pass just Form and matcherKey to param function?
| @@ -307,7 +307,8 @@ func (z ZLabelSets) Less(i, j int) bool { | |||
| l := 0 | |||
| r := 0 | |||
| var result int | |||
| for l < z[i].Size() && r < z[j].Size() { | |||
| lenI, lenJ := len(z[i].Labels), len(z[j].Labels) | |||
Signed-off-by: Ben Ye <yb532204897@gmail.com>
|
Hi, please take a look again. @bwplotka @metalmatze |
|
We need changelog but we can add on release PR |
|
when release v0.17.2 ? i meet this bug, so had to go back v0.16.0. |
metalmatze
pushed a commit
to metalmatze/thanos
that referenced
this pull request
Dec 9, 2020
* fix index out of bound bug when comparing ZLabelSets Signed-off-by: Ben Ye <yb532204897@gmail.com> * fix param parsing error message Signed-off-by: Ben Ye <yb532204897@gmail.com> * address comment feedbacks Signed-off-by: Ben Ye <yb532204897@gmail.com>
bwplotka
added a commit
that referenced
this pull request
Dec 9, 2020
* Fix query frontend regression on release v0.17.0 (#3480) * query-frontend: make POST-request to downstream url for labels and series api endpoints (#3444) Signed-off-by: Alexander Tunik <2braven@gmail.com> * remove default response cache config Signed-off-by: Ben Ye <yb532204897@gmail.com> * ensure order when merging multiple responses Signed-off-by: Ben Ye <yb532204897@gmail.com> Co-authored-by: Alexander Tunik <2braven@gmail.com> * *: Set debug.SetPanicOnFault(true) so we can recover seg faults. (#3498) Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Prepare v0.17.1 release (#3505) Signed-off-by: Matthias Loibl <mail@matthiasloibl.com> * fix index out of bound bug when comparing ZLabelSets (#3520) * fix index out of bound bug when comparing ZLabelSets Signed-off-by: Ben Ye <yb532204897@gmail.com> * fix param parsing error message Signed-off-by: Ben Ye <yb532204897@gmail.com> * address comment feedbacks Signed-off-by: Ben Ye <yb532204897@gmail.com> * compact: do not cleanup blocks on boot (#3532) Do not cleanup blocks on boot because in some very bad cases there could be thousands of blocks ready-to-be deleted and doing that makes Thanos Compact exceed `initialDelaySeconds` on k8s. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> * Prepare v0.17.2 (#3543) Signed-off-by: Matthias Loibl <mail@matthiasloibl.com> * Properly rebase CHANGELOG.md after merging release-0.17 Signed-off-by: Matthias Loibl <mail@matthiasloibl.com> Co-authored-by: Ben Ye <yb532204897@gmail.com> Co-authored-by: Alexander Tunik <2braven@gmail.com> Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: Giedrius Statkevičius <giedriuswork@gmail.com>
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.
Signed-off-by: Ben Ye yb532204897@gmail.com
Changes
Fixes #3515
The bug is originated from that I got the label pair length using
Size()method, it is a stupid mistake 👎 because it doesn't return the number of label pairs.Added one test case to ensure no panic for comparing the same label sets.
However, we deduplicate the series before sorting them so the case shouldn't happen. Still investigating the root cause and trying to reproduce this from the query frontend side.
Verification