rules: manager: avoid panic when cloning when TZ != UTC #2925
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
The following panic can be observed when calling `api/v1/rules` without
this change:
```
2020/07/22 21:44:22 http: panic serving 127.0.0.1:49368: merger not found for type:int
goroutine 529 [running]:
net/http.(*conn).serve.func1(0xc00029e640)
/usr/lib/go-1.14/src/net/http/server.go:1772 +0x139
panic(0x1e0a400, 0xc000368c30)
/usr/lib/go-1.14/src/runtime/panic.go:975 +0x3e3
github.com/gogo/protobuf/proto.(*mergeInfo).computeMergeInfo(0xc0008b8780)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:662 +0xfc6
github.com/gogo/protobuf/proto.(*mergeInfo).merge(0xc0008b8780, 0xc0007447a0, 0xc00057bb00)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:113 +0x4a2
github.com/gogo/protobuf/proto.(*mergeInfo).computeMergeInfo.func27(0xc000091b70, 0x3991910)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:545 +0x381
github.com/gogo/protobuf/proto.(*mergeInfo).merge(0xc0008b8700, 0xc000091b60, 0x3991900)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:139 +0x46a
github.com/gogo/protobuf/proto.(*mergeInfo).computeMergeInfo.func30(0xc00061e470, 0xc00061e370)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:587 +0x5c
github.com/gogo/protobuf/proto.(*mergeInfo).merge(0xc0008b8340, 0xc00061e460, 0xc00061e360)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:139 +0x46a
github.com/gogo/protobuf/proto.(*mergeInfo).computeMergeInfo.func28(0xc00061e460, 0xc00061e360)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:555 +0x3e
github.com/gogo/protobuf/proto.(*mergeInfo).merge(0xc0008b83c0, 0xc00061e400, 0xc00061e300)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:139 +0x46a
github.com/gogo/protobuf/proto.(*InternalMessageInfo).Merge(0x398a440, 0x2676ea0, 0xc00061e400, 0x2676ea0, 0xc00061e300)
/home/gstatkevicius/go/pkg/mod/github.com/gogo/protobuf@v1.3.1/proto/table_merge.go:50 +0x4c
github.com/thanos-io/thanos/pkg/rules/rulespb.(*RecordingRule).XXX_Merge(0xc00061e400, 0x2676ea0, 0xc00061e300)
/home/gstatkevicius/dev/thanos/pkg/rules/rulespb/rpc.pb.go:527 +0x57
```
Let's use the workaround given here:
gogo/protobuf#519.
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
GiedriusS
changed the title
2 tasks
Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
GiedriusS
changed the title
onprem
approved these changes
Jul 24, 2020
GiedriusS
added a commit
to GiedriusS/thanos
that referenced
this pull request
Jul 29, 2020
Fixes thanos-io#2938 and is a follow up to thanos-io#2925. Changes: * Copying all fields properly to the group-level as well * Set TZ to UTC explicitly in other `time.Time` fields to avoid a panic * Make sure that `RuleGroup` always has an empty array in the `rules` field because that's customary and that is what the new React UI expects. Manual testing for now. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
2 tasks
bwplotka
pushed a commit
that referenced
this pull request
Aug 11, 2020
* rules: fix silly mistakes in the rules API Fixes #2938 and is a follow up to #2925. Changes: * Copying all fields properly to the group-level as well * Set TZ to UTC explicitly in other `time.Time` fields to avoid a panic * Make sure that `RuleGroup` always has an empty array in the `rules` field because that's customary and that is what the new React UI expects. Manual testing for now. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> * rules: remove DeprecatedPartialResponseStrategy It has been marked deprecated for more than 2 months. Remove it finally. Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> * e2e: rules_api: add checks for non-zero values Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> * test: e2e: fix rule test Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> * test: rule: fix govet error Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> * Update CHANGELOG.md Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> Co-authored-by: Lucas Servén Marín <lserven@gmail.com> * Update CHANGELOG.md Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com> Co-authored-by: Lucas Servén Marín <lserven@gmail.com> Co-authored-by: Lucas Servén Marín <lserven@gmail.com>
2 tasks
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.
The following panic can be observed when calling
/api/v1/ruleswithoutthis change when the TZ is not UTC:
Let's use the workaround given here:
gogo/protobuf#519.
Signed-off-by: Giedrius Statkevičius giedriuswork@gmail.com
Changes
Forcing the conversion of
LastEvaluationinto UTC to fix the observed panicVerification
PROMETHEUS_EXECUTABLE=~/dev/prometheus/prometheus ./scripts/quickstart.shand openedhttp://localhost:19999/api/v1/rules